diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-06-11 16:49:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-10 22:20:24 +0000 |
| commit | 343a78fae064d666b02416b56039b86c554fa615 (patch) | |
| tree | 0ce7c40a33b438deec032db404d4f59e96289965 /emulator/opengl/shared/emugl/common/Android.mk | |
| parent | a1b9c2959460852c13c18addb428224a94c72439 (diff) | |
| parent | d430650793909f763de85847d234903606302b96 (diff) | |
| download | sdk-343a78fae064d666b02416b56039b86c554fa615.zip sdk-343a78fae064d666b02416b56039b86c554fa615.tar.gz sdk-343a78fae064d666b02416b56039b86c554fa615.tar.bz2 | |
Merge "emulator/opengl: Prepare for 64-bit build changes." into idea133
Diffstat (limited to 'emulator/opengl/shared/emugl/common/Android.mk')
| -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) |