diff options
| author | David 'Digit' Turner <digit@google.com> | 2015-03-20 22:17:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-20 22:17:12 +0000 |
| commit | c714e27a4ef2f451bd0517de73797405dcdf683b (patch) | |
| tree | 33b7e4f6de969d379a823543923d0750da54843a /emulator/opengl/shared | |
| parent | fc2a7dfe9350400514c8e21023ea2ef46266f712 (diff) | |
| parent | ddb5d875c38022441d4b2e9de3b874b5e1c4df9b (diff) | |
| download | sdk-c714e27a4ef2f451bd0517de73797405dcdf683b.zip sdk-c714e27a4ef2f451bd0517de73797405dcdf683b.tar.gz sdk-c714e27a4ef2f451bd0517de73797405dcdf683b.tar.bz2 | |
am ddb5d875: am 972e1c6d: Merge "emulator/opengl: Cleanup build files + remove obsolete tests."
* commit 'ddb5d875c38022441d4b2e9de3b874b5e1c4df9b':
emulator/opengl: Cleanup build files + remove obsolete tests.
Diffstat (limited to 'emulator/opengl/shared')
| -rw-r--r-- | emulator/opengl/shared/OpenglCodecCommon/Android.mk | 15 | ||||
| -rw-r--r-- | emulator/opengl/shared/emugl/common/Android.mk | 32 |
2 files changed, 19 insertions, 28 deletions
diff --git a/emulator/opengl/shared/OpenglCodecCommon/Android.mk b/emulator/opengl/shared/OpenglCodecCommon/Android.mk index 0c3f827..ff680eb 100644 --- a/emulator/opengl/shared/OpenglCodecCommon/Android.mk +++ b/emulator/opengl/shared/OpenglCodecCommon/Android.mk @@ -34,14 +34,11 @@ $(call emugl-end-module) ### OpenglCodecCommon host, 64-bit ######################################### -ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host64-static-library,lib64OpenglCodecCommon) +$(call emugl-begin-host64-static-library,lib64OpenglCodecCommon) - LOCAL_SRC_FILES := $(host_commonSources) +LOCAL_SRC_FILES := $(host_commonSources) +$(call emugl-import, lib64emugl_common) +$(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/host/include/libOpenglRender $(LOCAL_PATH)) +$(call emugl-export,LDLIBS,$(host_commonLdLibs)) +$(call emugl-end-module) - $(call emugl-import, lib64emugl_common) - $(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/host/include/libOpenglRender $(LOCAL_PATH)) - $(call emugl-export,CFLAGS,-m64 -fPIC) - $(call emugl-export,LDLIBS,$(host_commonLdLibs)) - $(call emugl-end-module) -endif diff --git a/emulator/opengl/shared/emugl/common/Android.mk b/emulator/opengl/shared/emugl/common/Android.mk index fb9ab57..6aaa0d9 100644 --- a/emulator/opengl/shared/emugl/common/Android.mk +++ b/emulator/opengl/shared/emugl/common/Android.mk @@ -31,14 +31,11 @@ $(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/shared) $(call emugl-export,LDLIBS,$(host_commonLdLibs)) $(call emugl-end-module) -ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host64-static-library,lib64emugl_common) - LOCAL_SRC_FILES := $(host_commonSources) - $(call emugl-export,CFLAGS,-m64 -fPIC) - $(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/shared) - $(call emugl-export,LDLIBS,$(host_commonLdLibs)) - $(call emugl-end-module) -endif +$(call emugl-begin-host64-static-library,lib64emugl_common) +LOCAL_SRC_FILES := $(host_commonSources) +$(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/shared) +$(call emugl-export,LDLIBS,$(host_commonLdLibs)) +$(call emugl-end-module) ### emugl_common_unittests ############################################## @@ -58,19 +55,16 @@ LOCAL_SRC_FILES := $(host_commonSources) $(call emugl-import,libemugl_common libemugl_gtest) $(call emugl-end-module) -ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host64-executable,emugl64_common_host_unittests) - LOCAL_SRC_FILES := $(host_commonSources) - $(call emugl-import,lib64emugl_common lib64emugl_gtest) - $(call emugl-end-module) -endif +$(call emugl-begin-host64-executable,emugl64_common_host_unittests) +LOCAL_SRC_FILES := $(host_commonSources) +$(call emugl-import,lib64emugl_common lib64emugl_gtest) +$(call emugl-end-module) + $(call emugl-begin-host-shared-library,libemugl_test_shared_library) LOCAL_SRC_FILES := testing/test_shared_library.cpp $(call emugl-end-module) -ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host64-shared-library,lib64emugl_test_shared_library) - LOCAL_SRC_FILES := testing/test_shared_library.cpp - $(call emugl-end-module) -endif +$(call emugl-begin-host64-shared-library,lib64emugl_test_shared_library) +LOCAL_SRC_FILES := testing/test_shared_library.cpp +$(call emugl-end-module) |