diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-03-22 13:27:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-22 13:27:43 -0700 |
| commit | 9e3e95f65fa8415c38a10caa3f211b9b9f896df5 (patch) | |
| tree | 4e9c7e27dabc760055e1ceff39076e0871b6aacc /tools/emulator/opengl/shared/OpenglCodecCommon | |
| parent | 40b67a0eb0ae7c612dd30611121cf3c655c49793 (diff) | |
| parent | 76780669f9867587693563358ccdc903e9cdcbba (diff) | |
am 76780669: Added rules to build 64-bit libraries for 64-bit emulator
* commit '76780669f9867587693563358ccdc903e9cdcbba':
Added rules to build 64-bit libraries for 64-bit emulator
Diffstat (limited to 'tools/emulator/opengl/shared/OpenglCodecCommon')
| -rw-r--r-- | tools/emulator/opengl/shared/OpenglCodecCommon/Android.mk | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/tools/emulator/opengl/shared/OpenglCodecCommon/Android.mk b/tools/emulator/opengl/shared/OpenglCodecCommon/Android.mk index 2f7da7976..7deb058f9 100644 --- a/tools/emulator/opengl/shared/OpenglCodecCommon/Android.mk +++ b/tools/emulator/opengl/shared/OpenglCodecCommon/Android.mk @@ -11,6 +11,15 @@ commonSources := \ TcpStream.cpp \ TimeUtils.cpp +host_commonSources := $(commonSources) + +ifeq ($(HOST_OS),windows) + host_commonSources += Win32PipeStream.cpp +else + host_commonSources += UnixStream.cpp +endif + + ### CodecCommon guest ############################################## $(call emugl-begin-static-library,libOpenglCodecCommon) @@ -22,18 +31,24 @@ $(call emugl-export,SHARED_LIBRARIES,libcutils libutils) $(call emugl-export,C_INCLUDES,$(LOCAL_PATH)) $(call emugl-end-module) + ### OpenglCodecCommon host ############################################## $(call emugl-begin-host-static-library,libOpenglCodecCommon) -LOCAL_SRC_FILES := $(commonSources) - -ifeq ($(HOST_OS),windows) - LOCAL_SRC_FILES += Win32PipeStream.cpp -else - LOCAL_SRC_FILES += UnixStream.cpp -endif +LOCAL_SRC_FILES := $(host_commonSources) $(call emugl-export,STATIC_LIBRARIES,libcutils) $(call emugl-export,C_INCLUDES,$(LOCAL_PATH)) $(call emugl-end-module) + +### OpenglCodecCommon host, 64-bit ######################################### +$(call emugl-begin-host-static-library,lib64OpenglCodecCommon) + +LOCAL_SRC_FILES := $(host_commonSources) + +$(call emugl-export,STATIC_LIBRARIES,lib64cutils) +$(call emugl-export,C_INCLUDES,$(LOCAL_PATH)) +$(call emugl-export,CFLAGS,-m64) +$(call emugl-end-module) + |