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/common.mk | |
| 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/common.mk')
| -rw-r--r-- | emulator/opengl/common.mk | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/emulator/opengl/common.mk b/emulator/opengl/common.mk index d411899..255b9e3 100644 --- a/emulator/opengl/common.mk +++ b/emulator/opengl/common.mk @@ -24,20 +24,16 @@ emugl-begin-host-static-library = $(call emugl-begin-module,$1,HOST_STATIC_LIBRA emugl-begin-host-shared-library = $(call emugl-begin-module,$1,HOST_SHARED_LIBRARY,HOST) emugl-begin-host-executable = $(call emugl-begin-module,$1,HOST_EXECUTABLE,HOST) +emugl-begin-host64-static-library = $(call emugl-begin-module64,$1,HOST_STATIC_LIBRARY,HOST) +emugl-begin-host64-shared-library = $(call emugl-begin-module64,$1,HOST_SHARED_LIBRARY,HOST) +emugl-begin-host64-executable = $(call emugl-begin-module64,$1,HOST_EXECUTABLE,HOST) + # Internal list of all declared modules (used for sanity checking) _emugl_modules := _emugl_HOST_modules := ifeq ($(BUILD_STANDALONE_EMULATOR),true) -define EMUGL_LOCAL_EXTRAS -LOCAL_CC := $$(call my-host-tool,CC) -LOCAL_CXX := $$(call my-host-tool,CXX) -LOCAL_LD := $$(call my-host-tool,LD) -LOCAL_AR := $$(call my-host-tool,AR) -LOCAL_CFLAGS := $$(call my-host-tool,CFLAGS) $$(LOCAL_CFLAGS) -LOCAL_LDFLAGS := $$(call my-host-tool,LDFLAGS) $$(LOCAL_LDFLAGS) -LOCAL_LDLIBS := $$(LOCAL_LDLIBS) $$(call my-host-tool,LDLIBS) -endef +EMUGL_LOCAL_EXTRAS = $(end-emulator-module-ev) else # BUILD_STANDALONE_EMULATOR != true EMUGL_LOCAL_EXTRAS = endif # BUILD_STANDALONE_EMULATOR != true @@ -54,8 +50,13 @@ emugl-begin-module = \ $(eval LOCAL_LDLIBS += -lstdc++) \ $(eval LOCAL_PRELINK_MODULE := false)\ $(eval _EMUGL_INCLUDE_TYPE := $(BUILD_$2)) \ + $(eval LOCAL_MODULE_BITS := 32) \ $(call _emugl-init-module,$1,$2,$3) +emugl-begin-module64 = \ + $(call emugl-begin-module,$1,$2,$3) \ + $(eval LOCAL_MODULE_BITS := 64) \ + # Used to end a module definition, see function definitions above emugl-end-module = \ $(eval $(EMUGL_LOCAL_EXTRAS)) \ @@ -103,6 +104,7 @@ emugl-end-module = \ # This is the list of recognized export types we support for now. EMUGL_EXPORT_TYPES := \ CFLAGS \ + CXXFLAGS \ LDLIBS \ LDFLAGS \ C_INCLUDES \ |