diff options
author | David 'Digit' Turner <digit@google.com> | 2014-06-11 14:57:38 +0200 |
---|---|---|
committer | David 'Digit' Turner <digit@google.com> | 2014-06-11 14:57:38 +0200 |
commit | d430650793909f763de85847d234903606302b96 (patch) | |
tree | 2662edbc2849cb1461bdde7b19d1fbbc4b5b4c78 /emulator/opengl | |
parent | 14338f93d7ab117bbc0f15e206622a99e1ff9d2f (diff) | |
download | sdk-d430650793909f763de85847d234903606302b96.zip sdk-d430650793909f763de85847d234903606302b96.tar.gz sdk-d430650793909f763de85847d234903606302b96.tar.bz2 |
emulator/opengl: Prepare for 64-bit build changes.
This patch slightly modifies the build files for the GPU emulation
libraries to prepare for future changes in the emulator-specific
build system that will be necessary to support Win64 binaries.
The main difference is the introduction of 64-bit versions of the
emugl-begin-host-<type> macros, named emugl-begin-host64-<type>.
Change-Id: Ib40c030fa407b0ed951755dd9b007fda85778e03
Diffstat (limited to 'emulator/opengl')
-rw-r--r-- | emulator/opengl/common.mk | 20 | ||||
-rw-r--r-- | emulator/opengl/googletest.mk | 2 | ||||
-rw-r--r-- | emulator/opengl/host/libs/GLESv1_dec/Android.mk | 2 | ||||
-rw-r--r-- | emulator/opengl/host/libs/GLESv2_dec/Android.mk | 2 | ||||
-rw-r--r-- | emulator/opengl/host/libs/Translator/EGL/Android.mk | 2 | ||||
-rw-r--r-- | emulator/opengl/host/libs/Translator/GLES_CM/Android.mk | 2 | ||||
-rw-r--r-- | emulator/opengl/host/libs/Translator/GLES_V2/Android.mk | 2 | ||||
-rw-r--r-- | emulator/opengl/host/libs/Translator/GLcommon/Android.mk | 2 | ||||
-rw-r--r-- | emulator/opengl/host/libs/libOpenglRender/Android.mk | 2 | ||||
-rw-r--r-- | emulator/opengl/host/libs/renderControl_dec/Android.mk | 2 | ||||
-rw-r--r-- | emulator/opengl/shared/OpenglCodecCommon/Android.mk | 2 | ||||
-rw-r--r-- | emulator/opengl/shared/OpenglOsUtils/Android.mk | 2 | ||||
-rw-r--r-- | emulator/opengl/shared/emugl/common/Android.mk | 4 |
13 files changed, 24 insertions, 22 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 \ diff --git a/emulator/opengl/googletest.mk b/emulator/opengl/googletest.mk index a49789a..8147874 100644 --- a/emulator/opengl/googletest.mk +++ b/emulator/opengl/googletest.mk @@ -31,7 +31,7 @@ $(call emugl-export,LDLIBS,$(common_LDLIBS)) $(call emugl-end-module) ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-static-library,lib64emugl_gtest) + $(call emugl-begin-host64-static-library,lib64emugl_gtest) LOCAL_SRC_FILES := $(common_SRC_FILES) LOCAL_CFLAGS += $(common_CFLAGS) LOCAL_C_INCLUDES += $(LOCAL_PATH)/include diff --git a/emulator/opengl/host/libs/GLESv1_dec/Android.mk b/emulator/opengl/host/libs/GLESv1_dec/Android.mk index 811a2bb..7ab3f0a 100644 --- a/emulator/opengl/host/libs/GLESv1_dec/Android.mk +++ b/emulator/opengl/host/libs/GLESv1_dec/Android.mk @@ -25,7 +25,7 @@ $(call emugl-end-module) ### host library, 64-bit #################################### ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-static-library,lib64GLESv1_dec) + $(call emugl-begin-host64-static-library,lib64GLESv1_dec) $(call emugl-import, lib64OpenglCodecCommon lib64OpenglOsUtils) $(call emugl-export,C_INCLUDES,$(LOCAL_PATH)) diff --git a/emulator/opengl/host/libs/GLESv2_dec/Android.mk b/emulator/opengl/host/libs/GLESv2_dec/Android.mk index 03692ee..bc04c25 100644 --- a/emulator/opengl/host/libs/GLESv2_dec/Android.mk +++ b/emulator/opengl/host/libs/GLESv2_dec/Android.mk @@ -23,7 +23,7 @@ $(call emugl-end-module) ### host library, 64-bit #################################### ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-static-library,lib64GLESv2_dec) + $(call emugl-begin-host64-static-library,lib64GLESv2_dec) $(call emugl-import, lib64OpenglCodecCommon lib64OpenglOsUtils) $(call emugl-gen-decoder,$(LOCAL_PATH),gl2) diff --git a/emulator/opengl/host/libs/Translator/EGL/Android.mk b/emulator/opengl/host/libs/Translator/EGL/Android.mk index 40f165a..5d1c9b2 100644 --- a/emulator/opengl/host/libs/Translator/EGL/Android.mk +++ b/emulator/opengl/host/libs/Translator/EGL/Android.mk @@ -48,7 +48,7 @@ $(call emugl-end-module) ### EGL host implementation, 64-bit ######################## ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-shared-library,lib64EGL_translator) + $(call emugl-begin-host64-shared-library,lib64EGL_translator) $(call emugl-import,lib64GLcommon) LOCAL_LDLIBS += $(host_common_LDLIBS) -m64 diff --git a/emulator/opengl/host/libs/Translator/GLES_CM/Android.mk b/emulator/opengl/host/libs/Translator/GLES_CM/Android.mk index b126902..c5e7e6d 100644 --- a/emulator/opengl/host/libs/Translator/GLES_CM/Android.mk +++ b/emulator/opengl/host/libs/Translator/GLES_CM/Android.mk @@ -19,7 +19,7 @@ $(call emugl-end-module) ### GLES_CM host implementation, 64-bit ######################## ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-shared-library,lib64GLES_CM_translator) + $(call emugl-begin-host64-shared-library,lib64GLES_CM_translator) $(call emugl-import,lib64GLcommon) diff --git a/emulator/opengl/host/libs/Translator/GLES_V2/Android.mk b/emulator/opengl/host/libs/Translator/GLES_V2/Android.mk index 9175ab5..438334a 100644 --- a/emulator/opengl/host/libs/Translator/GLES_V2/Android.mk +++ b/emulator/opengl/host/libs/Translator/GLES_V2/Android.mk @@ -19,7 +19,7 @@ $(call emugl-end-module) ### GLES_V2 host implementation, 64-bit ############################## ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-shared-library,lib64GLES_V2_translator) + $(call emugl-begin-host64-shared-library,lib64GLES_V2_translator) $(call emugl-import, lib64GLcommon) LOCAL_LDLIBS += -m64 diff --git a/emulator/opengl/host/libs/Translator/GLcommon/Android.mk b/emulator/opengl/host/libs/Translator/GLcommon/Android.mk index 375da8b..b215329 100644 --- a/emulator/opengl/host/libs/Translator/GLcommon/Android.mk +++ b/emulator/opengl/host/libs/Translator/GLcommon/Android.mk @@ -48,7 +48,7 @@ $(call emugl-end-module) ### EGL host implementation, 64-bit ################ ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-static-library,lib64GLcommon) + $(call emugl-begin-host64-static-library,lib64GLcommon) $(call emugl-import,lib64OpenglOsUtils) translator_path := $(LOCAL_PATH)/.. diff --git a/emulator/opengl/host/libs/libOpenglRender/Android.mk b/emulator/opengl/host/libs/libOpenglRender/Android.mk index 3cfbef0..787ae83 100644 --- a/emulator/opengl/host/libs/libOpenglRender/Android.mk +++ b/emulator/opengl/host/libs/libOpenglRender/Android.mk @@ -63,7 +63,7 @@ $(call emugl-end-module) ### host libOpenglRender, 64-bit ######################################### ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-shared-library,lib64OpenglRender) + $(call emugl-begin-host64-shared-library,lib64OpenglRender) $(call emugl-import,lib64GLESv1_dec lib64GLESv2_dec lib64_renderControl_dec lib64OpenglCodecCommon lib64OpenglOsUtils) diff --git a/emulator/opengl/host/libs/renderControl_dec/Android.mk b/emulator/opengl/host/libs/renderControl_dec/Android.mk index 3bc5c3e..4a97a93 100644 --- a/emulator/opengl/host/libs/renderControl_dec/Android.mk +++ b/emulator/opengl/host/libs/renderControl_dec/Android.mk @@ -11,7 +11,7 @@ $(call emugl-end-module) ### host library, 64-bit #################################### ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-static-library,lib64_renderControl_dec) + $(call emugl-begin-host64-static-library,lib64_renderControl_dec) $(call emugl-import,lib64OpenglCodecCommon) $(call emugl-gen-decoder,$(LOCAL_PATH),renderControl) # For renderControl_types.h diff --git a/emulator/opengl/shared/OpenglCodecCommon/Android.mk b/emulator/opengl/shared/OpenglCodecCommon/Android.mk index b6a7e07..83090d8 100644 --- a/emulator/opengl/shared/OpenglCodecCommon/Android.mk +++ b/emulator/opengl/shared/OpenglCodecCommon/Android.mk @@ -32,7 +32,7 @@ $(call emugl-end-module) ### OpenglCodecCommon host, 64-bit ######################################### ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-static-library,lib64OpenglCodecCommon) + $(call emugl-begin-host64-static-library,lib64OpenglCodecCommon) LOCAL_SRC_FILES := $(host_commonSources) diff --git a/emulator/opengl/shared/OpenglOsUtils/Android.mk b/emulator/opengl/shared/OpenglOsUtils/Android.mk index a3dd3c2..f9673fc 100644 --- a/emulator/opengl/shared/OpenglOsUtils/Android.mk +++ b/emulator/opengl/shared/OpenglOsUtils/Android.mk @@ -38,7 +38,7 @@ $(call emugl-end-module) ### 64-bit host library #### ifdef EMUGL_BUILD_64BITS - $(call emugl-begin-host-static-library,lib64OpenglOsUtils) + $(call emugl-begin-host64-static-library,lib64OpenglOsUtils) $(call emugl-export,C_INCLUDES,$(host_common_INCLUDES)) LOCAL_SRC_FILES = $(host_common_SRC_FILES) $(call emugl-export,LDLIBS,$(host_common_LDLIBS)) 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) |