diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-08-29 11:40:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-29 11:40:11 +0000 |
| commit | ddb5d875c38022441d4b2e9de3b874b5e1c4df9b (patch) | |
| tree | dd49d80843e153f72f8003561c893015478d67a1 /emulator/opengl/host/libs/Translator/GLcommon/Android.mk | |
| parent | 35e336b1c6378da70c891ad68ebee662414b52c1 (diff) | |
| parent | 972e1c6d399e81b59fc07d7b7bdc77069ebac1c7 (diff) | |
| download | sdk-ddb5d875c38022441d4b2e9de3b874b5e1c4df9b.zip sdk-ddb5d875c38022441d4b2e9de3b874b5e1c4df9b.tar.gz sdk-ddb5d875c38022441d4b2e9de3b874b5e1c4df9b.tar.bz2 | |
am 972e1c6d: Merge "emulator/opengl: Cleanup build files + remove obsolete tests."
* commit '972e1c6d399e81b59fc07d7b7bdc77069ebac1c7':
emulator/opengl: Cleanup build files + remove obsolete tests.
Diffstat (limited to 'emulator/opengl/host/libs/Translator/GLcommon/Android.mk')
| -rw-r--r-- | emulator/opengl/host/libs/Translator/GLcommon/Android.mk | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/emulator/opengl/host/libs/Translator/GLcommon/Android.mk b/emulator/opengl/host/libs/Translator/GLcommon/Android.mk index fdbedad..d1a462d 100644 --- a/emulator/opengl/host/libs/Translator/GLcommon/Android.mk +++ b/emulator/opengl/host/libs/Translator/GLcommon/Android.mk @@ -46,16 +46,13 @@ $(call emugl-end-module) ### EGL host implementation, 64-bit ################ -ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host64-static-library,lib64GLcommon) - - translator_path := $(LOCAL_PATH)/.. - LOCAL_SRC_FILES := $(host_common_SRC_FILES) - LOCAL_CFLAGS += -fPIC - $(call emugl-export,LDLIBS,$(host_common_LDLIBS)) - $(call emugl-export,LDFLAGS,$(host_common_LDFLAGS)) - $(call emugl-export,C_INCLUDES,$(LOCAL_PATH)/../include $(EMUGL_PATH)/shared) - $(call emugl-export,STATIC_LIBRARIES, lib64emugl_common) - - $(call emugl-end-module) -endif
\ No newline at end of file +$(call emugl-begin-host64-static-library,lib64GLcommon) + +translator_path := $(LOCAL_PATH)/.. +LOCAL_SRC_FILES := $(host_common_SRC_FILES) +$(call emugl-export,LDLIBS,$(host_common_LDLIBS)) +$(call emugl-export,LDFLAGS,$(host_common_LDFLAGS)) +$(call emugl-export,C_INCLUDES,$(LOCAL_PATH)/../include $(EMUGL_PATH)/shared) +$(call emugl-export,STATIC_LIBRARIES, lib64emugl_common) + +$(call emugl-end-module) |