diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-06-11 16:59:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-06-11 16:59:55 +0000 |
| commit | 1af0da2cd774d5374b87d08277d34fe3a5d8dc73 (patch) | |
| tree | dc88df478d2b0311d2fc67887a7053fc2c665e78 /emulator/opengl/shared/emugl | |
| parent | 634a32a8f4a341a1500573515a6bcd97e8d3145e (diff) | |
| parent | 343a78fae064d666b02416b56039b86c554fa615 (diff) | |
| download | sdk-1af0da2cd774d5374b87d08277d34fe3a5d8dc73.zip sdk-1af0da2cd774d5374b87d08277d34fe3a5d8dc73.tar.gz sdk-1af0da2cd774d5374b87d08277d34fe3a5d8dc73.tar.bz2 | |
Merge "emulator/opengl: Prepare for 64-bit build changes." into idea133
automerge: 343a78f
* commit '343a78fae064d666b02416b56039b86c554fa615':
emulator/opengl: Prepare for 64-bit build changes.
Diffstat (limited to 'emulator/opengl/shared/emugl')
| -rw-r--r-- | emulator/opengl/shared/emugl/common/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/emulator/opengl/shared/emugl/common/Android.mk b/emulator/opengl/shared/emugl/common/Android.mk index fd7761e..58dd6da 100644 --- a/emulator/opengl/shared/emugl/common/Android.mk +++ b/emulator/opengl/shared/emugl/common/Android.mk @@ -22,7 +22,7 @@ $(call emugl-export,LDLIBS,-lstdc++) $(call emugl-end-module) ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-static-library,lib64emugl_common) + $(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) @@ -47,7 +47,7 @@ $(call emugl-import,libemugl_common libemugl_gtest) $(call emugl-end-module) ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-executable,emugl64_common_host_unittests) + $(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) |