LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 6d241caf: Merge "emulator: opengl: support moved shared libraries."

Browse Source 
* commit '6d241caf737de944a3420a08ec8739623ac47283':
  emulator: opengl: support moved shared libraries.
This commit is contained in:
David 'Digit' Turner
2011-08-24 09:20:27 -07:00
committed by Android Git Automerger
parent 4a6acc04ca 6d241caf73
commit e526f515d4
4 changed files with 34 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/emulator/opengl/common.mk
View File

@@ -109,6 +109,7 @@ _emugl-init-module = \
$(eval _mod = $(_emugl_MODULE)) \ $(eval _mod = $(_emugl_MODULE)) \
$(eval _emugl.$(_mod).type := $(patsubst HOST_%,%,$2))\ $(eval _emugl.$(_mod).type := $(patsubst HOST_%,%,$2))\
$(eval _emugl.$(_mod).imports :=) \ $(eval _emugl.$(_mod).imports :=) \
$(eval _emugl,$(_mod).moved :=) \
$(foreach _type,$(EMUGL_EXPORT_TYPES),\ $(foreach _type,$(EMUGL_EXPORT_TYPES),\
$(eval _emugl.$(_mod).export.$(_type) :=)\ $(eval _emugl.$(_mod).export.$(_type) :=)\
) )
@@ -156,7 +157,9 @@ _emugl-module-import = \
$(eval LOCAL_STATIC_LIBRARIES := $(1:HOST_%=%) $(LOCAL_STATIC_LIBRARIES))\ $(eval LOCAL_STATIC_LIBRARIES := $(1:HOST_%=%) $(LOCAL_STATIC_LIBRARIES))\
)\ )\
$(if $(filter SHARED_LIBRARY,$(_emugl.$1.type)),\ $(if $(filter SHARED_LIBRARY,$(_emugl.$1.type)),\
$(eval LOCAL_SHARED_LIBRARIES := $(1:HOST_%=%) $(LOCAL_SHARED_LIBRARIES))\ $(if $(_emugl.$1.moved),,\
$(eval LOCAL_SHARED_LIBRARIES := $(1:HOST_%=%) $(LOCAL_SHARED_LIBRARIES))\
)\
)\ )\
)\ )\
) )
@@ -332,5 +335,7 @@ endef
# For example: $(call emugl-set-shared-library-subpath,egl) # For example: $(call emugl-set-shared-library-subpath,egl)
emugl-set-shared-library-subpath = \ emugl-set-shared-library-subpath = \
$(eval LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/$1)\ $(eval LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/$1)\
$(eval LOCAL_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/$1)\
$(eval _emugl.$(LOCAL_MODULE).moved := true)\
$(call emugl-export-outer,ADDITIONAL_DEPENDENCIES,$(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)$(TARGET_SHLIB_SUFFIX)) $(call emugl-export-outer,ADDITIONAL_DEPENDENCIES,$(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)$(TARGET_SHLIB_SUFFIX))

61
tools/emulator/opengl/system/egl/Android.mk
View File

@@ -1,57 +1,24 @@
ifneq (,$(BUILD_EMULATOR_OPENGL_DRIVER)) ifneq (false,$(BUILD_EMULATOR_OPENGL_DRIVER))
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
emulatorOpengl := $(LOCAL_PATH)/../..
### EGL implementation ########################################### $(call emugl-begin-shared-library,libEGL_emulation)
include $(CLEAR_VARS) $(call emugl-import,libOpenglSystemCommon)
$(call emugl-set-shared-library-subpath,egl)
# add additional depencies to ensure that the generated code that we depend on LOCAL_CFLAGS += -DLOG_TAG=\"EGL_emulation\" -DEGL_EGLEXT_PROTOTYPES -DWITH_GLES2
# is generated
LOCAL_ADDITIONAL_DEPENDENCIES := \
$(TARGET_OUT_SHARED_LIBRARIES)/lib_renderControl_enc$(TARGET_SHLIB_SUFFIX) \
$(TARGET_OUT_SHARED_LIBRARIES)/libGLESv1_enc$(TARGET_SHLIB_SUFFIX)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
eglDisplay.cpp \ eglDisplay.cpp \
egl.cpp \ egl.cpp \
ClientAPIExts.cpp ClientAPIExts.cpp
LOCAL_SHARED_LIBRARIES += libdl
# Used to access the Bionic private OpenGL TLS slot
LOCAL_C_INCLUDES += bionic/libc/private LOCAL_C_INCLUDES += bionic/libc/private
LOCAL_PRELINK_MODULE := false $(call emugl-end-module)
LOCAL_CFLAGS += -DLOG_TAG=\"EGL_emulation\" -DEGL_EGLEXT_PROTOTYPES -DWITH_GLES2
LOCAL_C_INCLUDES += \
$(emulatorOpengl)/host/include/libOpenglRender \
$(emulatorOpengl)/shared/OpenglCodecCommon \
$(emulatorOpengl)/system/OpenglSystemCommon \
$(emulatorOpengl)/system/GLESv1_enc \
$(emulatorOpengl)/system/GLESv2_enc \
$(emulatorOpengl)/system/renderControl_enc \
$(call intermediates-dir-for, SHARED_LIBRARIES, lib_renderControl_enc) \
$(call intermediates-dir-for, SHARED_LIBRARIES, libGLESv1_enc) \
$(call intermediates-dir-for, SHARED_LIBRARIES, libGLESv2_enc)
LOCAL_MODULE_TAGS := debug
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
LOCAL_MODULE := libEGL_emulation
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_PRELINK_MODULE := false
LOCAL_STATIC_LIBRARIES := \
libOpenglCodecCommon
LOCAL_SHARED_LIBRARIES := \
libcutils \
libutils \
libdl \
libGLESv1_enc \
libGLESv2_enc \
libOpenglSystemCommon \
lib_renderControl_enc
include $(BUILD_SHARED_LIBRARY)
#### egl.cfg #### #### egl.cfg ####
@@ -70,6 +37,6 @@ LOCAL_MODULE_TAGS := debug
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)
endif # TARGET_PRODUCT in 'full sdk full_x86 sdk_x86' endif # TARGET_PRODUCT in 'full sdk full_x86 sdk_x86)
endif # of ifneq (,$(BUILD_EMULATOR_OPENGL_DRIVER)) endif # BUILD_EMULATOR_OPENGL_DRIVER != false

45
tools/emulator/opengl/system/gralloc/Android.mk
View File

@@ -1,46 +1,19 @@
ifneq (,$(BUILD_EMULATOR_OPENGL_DRIVER)) ifneq (false,$(BUILD_EMULATOR_OPENGL_DRIVER))
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
emulatorOpengl := $(LOCAL_PATH)/../..
### OpenglSystemCommon ############################################## $(call emugl-begin-shared-library,gralloc.goldfish)
include $(CLEAR_VARS) $(call emugl-import,libGLESv1_enc lib_renderControl_enc libOpenglSystemCommon)
$(call emugl-set-shared-library-subpath,hw)
# add additional depencies to ensure that the generated code that we depend on LOCAL_CFLAGS += -DLOG_TAG=\"gralloc_goldfish\"
# is generated
LOCAL_ADDITIONAL_DEPENDENCIES := \
$(TARGET_OUT_SHARED_LIBRARIES)/lib_renderControl_enc$(TARGET_SHLIB_SUFFIX) \
$(TARGET_OUT_SHARED_LIBRARIES)/libGLESv1_enc$(TARGET_SHLIB_SUFFIX)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := gralloc.cpp
gralloc.cpp
# Need to access the special OPENGL TLS Slot
LOCAL_C_INCLUDES += bionic/libc/private LOCAL_C_INCLUDES += bionic/libc/private
LOCAL_C_INCLUDES += \
$(emulatorOpengl)/host/include/libOpenglRender \
$(emulatorOpengl)/shared/OpenglCodecCommon \
$(emulatorOpengl)/system/OpenglSystemCommon \
$(emulatorOpengl)/system/GLESv1_enc \
$(emulatorOpengl)/system/renderControl_enc \
$(call intermediates-dir-for, SHARED_LIBRARIES, lib_renderControl_enc) \
$(call intermediates-dir-for, SHARED_LIBRARIES, libGLESv1_enc)
LOCAL_MODULE_TAGS := debug $(call emugl-end-module)
LOCAL_PRELINK_MODULE := false
LOCAL_CFLAGS:= -DLOG_TAG=\"gralloc_goldfish\"
LOCAL_MODULE_PATH = $(TARGET_OUT_SHARED_LIBRARIES)/hw
LOCAL_MODULE := gralloc.goldfish
LOCAL_STATIC_LIBRARIES := \ endif # BUILD_EMULATOR_OPENGL_DRIVER != false
libOpenglCodecCommon
LOCAL_SHARED_LIBRARIES := \
libcutils \
libOpenglSystemCommon \
libGLESv1_enc \
lib_renderControl_enc
include $(BUILD_SHARED_LIBRARY)
endif # of ifneq (,$(GEODON_DRIVER))

63
tools/emulator/opengl/tests/gles_android_wrapper/Android.mk
View File

@@ -28,21 +28,11 @@ $(call emugl-end-module)
# THE FOLLOWING DOESN'T WORK YET # THE FOLLOWING DOESN'T WORK YET
# #
# $(call emugl-begin-shared-library,libEGL_emul) $(call emugl-begin-shared-library,libEGL_emul)
# $(call emugl-import,libut_rendercontrol_enc libGLESv1_enc libGLESv2_enc libOpenglSystemCommon) $(call emugl-import,libut_rendercontrol_enc libGLESv1_CM_emul libGLESv2_emul libOpenglSystemCommon)
#
# $(call emugl-set-shared-library-subpath,egl)
# LOCAL_CFLAGS += $(logTag)
#
# LOCAL_SRC_FILES := \
# egl.cpp \
# egl_dispatch.cpp \
# ServerConnection.cpp \
# ThreadInfo.cpp
#
# $(call emugl-end-module)
include $(CLEAR_VARS) $(call emugl-set-shared-library-subpath,egl)
LOCAL_CFLAGS += $(logTag)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
egl.cpp \ egl.cpp \
@@ -50,50 +40,7 @@ LOCAL_SRC_FILES := \
ServerConnection.cpp \ ServerConnection.cpp \
ThreadInfo.cpp ThreadInfo.cpp
# add additional depencies to ensure that the generated code that we depend on $(call emugl-end-module)
# is generated
LOCAL_ADDITIONAL_DEPENDENCIES := \
$(TARGET_OUT_SHARED_LIBRARIES)/libut_rendercontrol_enc$(TARGET_SHLIB_SUFFIX) \
$(TARGET_OUT_SHARED_LIBRARIES)/libGLESv1_enc$(TARGET_SHLIB_SUFFIX) \
$(TARGET_OUT_SHARED_LIBRARIES)/libGLESv2_enc$(TARGET_SHLIB_SUFFIX) \
$(TARGET_OUT_SHARED_LIBRARIES)/egl/libGLESv1_CM_emul$(TARGET_SHLIB_SUFFIX) \
$(TARGET_OUT_SHARED_LIBRARIES)/egl/libGLESv2_emul$(TARGET_SHLIB_SUFFIX)
LOCAL_C_INCLUDES := $(emulatorOpengl)/shared/OpenglCodecCommon \
$(emulatorOpengl)/host/include/libOpenglRender \
$(emulatorOpengl)/system/OpenglSystemCommon \
$(call intermediates-dir-for, SHARED_LIBRARIES, libut_rendercontrol_enc) \
$(call intermediates-dir-for, SHARED_LIBRARIES, libGLESv1_enc) \
$(call intermediates-dir-for, SHARED_LIBRARIES, libGLESv2_enc) \
$(call intermediates-dir-for, SHARED_LIBRARIES, libGLESv1_CM_emul) \
$(call intermediates-dir-for, SHARED_LIBRARIES, libGLESv2_emul) \
$(emulatorOpengl)/system/GLESv1_enc \
$(emulatorOpengl)/system/GLESv2_enc \
$(emulatorOpengl)/tests/ut_rendercontrol_enc
LOCAL_CFLAGS := $(logTag)
LOCAL_CFLAGS += $(debugFlags)
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
LOCAL_MODULE := libEGL_emul
LOCAL_MODULE_TAGS := debug
LOCAL_PRELINK_MODULE := false
#LOCAL_LDLIBS := -lpthread -ldl
LOCAL_SHARED_LIBRARIES := libdl \
libcutils \
libGLESv1_enc \
libGLESv2_enc \
libOpenglSystemCommon \
libut_rendercontrol_enc
LOCAL_STATIC_LIBRARIES := libOpenglCodecCommon
include $(BUILD_SHARED_LIBRARY)
#### egl.cfg #### #### egl.cfg ####