diff options
Diffstat (limited to 'opengl/libs')
| -rw-r--r-- | opengl/libs/Android.bp | 113 | ||||
| -rw-r--r-- | opengl/libs/Android.mk | 118 |
2 files changed, 113 insertions, 118 deletions
diff --git a/opengl/libs/Android.bp b/opengl/libs/Android.bp index bdd5152209..6a8aac8d70 100644 --- a/opengl/libs/Android.bp +++ b/opengl/libs/Android.bp @@ -45,3 +45,116 @@ ndk_library { symbol_file: "libGLESv3.map.txt", first_version: "18", } + +cc_defaults { + name: "gl_libs_defaults", + cflags: [ + "-DGL_GLEXT_PROTOTYPES", + "-DEGL_EGLEXT_PROTOTYPES", + "-fvisibility=hidden", + ], + shared_libs: [ + "libcutils", + "liblog", + "libdl", + ], + + // we need to access the private Bionic header <bionic_tls.h> + include_dirs: ["bionic/libc/private"], +} + +//############################################################################## +// Build META EGL library +// +cc_defaults { + name: "egl_libs_defaults", + defaults: ["gl_libs_defaults"], + cflags: [ + "-DLOG_TAG=\"libEGL\"", + ], + shared_libs: [ + "libbinder", + "libutils", + "libui", + ], +} + +cc_library_static { + name: "libEGL_getProcAddress", + defaults: ["egl_libs_defaults"], + srcs: ["EGL/getProcAddress.cpp"], + arch: { + arm: { + instruction_set: "arm", + }, + }, +} + +cc_library_shared { + name: "libEGL", + defaults: ["egl_libs_defaults"], + srcs: [ + "EGL/egl_tls.cpp", + "EGL/egl_cache.cpp", + "EGL/egl_display.cpp", + "EGL/egl_object.cpp", + "EGL/egl.cpp", + "EGL/eglApi.cpp", + "EGL/Loader.cpp", + ], + static_libs: ["libEGL_getProcAddress"], + ldflags: ["-Wl,--exclude-libs=ALL"], + + required: ["egl.cfg"], +} + +cc_defaults { + name: "gles_libs_defaults", + defaults: ["gl_libs_defaults"], + arch: { + arm: { + instruction_set: "arm", + + // TODO: This is to work around b/20093774. Remove after root cause is fixed + ldflags: ["-Wl,--hash-style,both"], + }, + }, + shared_libs: ["libEGL"], +} + +//############################################################################## +// Build the wrapper OpenGL ES 1.x library +// +cc_library_shared { + name: "libGLESv1_CM", + defaults: ["gles_libs_defaults"], + srcs: ["GLES_CM/gl.cpp"], + + cflags: ["-DLOG_TAG=\"libGLESv1\""], +} + +//############################################################################## +// Build the wrapper OpenGL ES 2.x library +// +cc_library_shared { + name: "libGLESv2", + defaults: ["gles_libs_defaults"], + srcs: ["GLES2/gl2.cpp"], + + shared_libs: ["libutils"], + + cflags: ["-DLOG_TAG=\"libGLESv2\""], +} + +//############################################################################## +// Build the wrapper OpenGL ES 3.x library (this is just different name for v2) +// +cc_library_shared { + name: "libGLESv3", + defaults: ["gles_libs_defaults"], + srcs: ["GLES2/gl2.cpp"], + + shared_libs: ["libutils"], + + cflags: ["-DLOG_TAG=\"libGLESv3\""], +} diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk index 789b325640..21e76f51d9 100644 --- a/opengl/libs/Android.mk +++ b/opengl/libs/Android.mk @@ -1,13 +1,7 @@ LOCAL_PATH:= $(call my-dir) -############################################################################### -# Build META EGL library -# - -egl.cfg_config_module := # OpenGL drivers config file ifneq ($(BOARD_EGL_CFG),) - include $(CLEAR_VARS) LOCAL_MODULE := egl.cfg LOCAL_MODULE_TAGS := optional @@ -15,116 +9,4 @@ LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/egl LOCAL_SRC_FILES := ../../../../$(BOARD_EGL_CFG) include $(BUILD_PREBUILT) -egl.cfg_config_module := $(LOCAL_MODULE) endif - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - EGL/egl_tls.cpp \ - EGL/egl_cache.cpp \ - EGL/egl_display.cpp \ - EGL/egl_object.cpp \ - EGL/egl.cpp \ - EGL/eglApi.cpp \ - EGL/getProcAddress.cpp.arm \ - EGL/Loader.cpp \ -# - -LOCAL_SHARED_LIBRARIES += libbinder libcutils libutils liblog libui -LOCAL_MODULE:= libEGL -LOCAL_LDFLAGS += -Wl,--exclude-libs=ALL -LOCAL_SHARED_LIBRARIES += libdl -# we need to access the private Bionic header <bionic_tls.h> -LOCAL_C_INCLUDES += bionic/libc/private - -LOCAL_CFLAGS += -DLOG_TAG=\"libEGL\" -LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES -LOCAL_CFLAGS += -fvisibility=hidden - -LOCAL_REQUIRED_MODULES := $(egl.cfg_config_module) -egl.cfg_config_module := - -include $(BUILD_SHARED_LIBRARY) - -############################################################################### -# Build the wrapper OpenGL ES 1.x library -# - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - GLES_CM/gl.cpp.arm \ -# - -LOCAL_SHARED_LIBRARIES += libcutils liblog libEGL -LOCAL_MODULE:= libGLESv1_CM - -LOCAL_SHARED_LIBRARIES += libdl -# we need to access the private Bionic header <bionic_tls.h> -LOCAL_C_INCLUDES += bionic/libc/private - -LOCAL_CFLAGS += -DLOG_TAG=\"libGLESv1\" -LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES -LOCAL_CFLAGS += -fvisibility=hidden - -# TODO: This is to work around b/20093774. Remove after root cause is fixed -LOCAL_LDFLAGS_arm += -Wl,--hash-style,both - -include $(BUILD_SHARED_LIBRARY) - - -############################################################################### -# Build the wrapper OpenGL ES 2.x library -# - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - GLES2/gl2.cpp \ -# - -LOCAL_ARM_MODE := arm -LOCAL_SHARED_LIBRARIES += libcutils libutils liblog libEGL -LOCAL_MODULE:= libGLESv2 - -LOCAL_SHARED_LIBRARIES += libdl -# we need to access the private Bionic header <bionic_tls.h> -LOCAL_C_INCLUDES += bionic/libc/private - -LOCAL_CFLAGS += -DLOG_TAG=\"libGLESv2\" -LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES -LOCAL_CFLAGS += -fvisibility=hidden - -# TODO: This is to work around b/20093774. Remove after root cause is fixed -LOCAL_LDFLAGS_arm += -Wl,--hash-style,both - -include $(BUILD_SHARED_LIBRARY) - -############################################################################### -# Build the wrapper OpenGL ES 3.x library (this is just different name for v2) -# - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - GLES2/gl2.cpp \ -# - -LOCAL_ARM_MODE := arm -LOCAL_SHARED_LIBRARIES += libcutils libutils liblog libEGL -LOCAL_MODULE:= libGLESv3 -LOCAL_SHARED_LIBRARIES += libdl -# we need to access the private Bionic header <bionic_tls.h> -LOCAL_C_INCLUDES += bionic/libc/private - -LOCAL_CFLAGS += -DLOG_TAG=\"libGLESv3\" -LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES -LOCAL_CFLAGS += -fvisibility=hidden - -# TODO: This is to work around b/20093774. Remove after root cause is fixed -LOCAL_LDFLAGS_arm += -Wl,--hash-style,both - -include $(BUILD_SHARED_LIBRARY) - -include $(call all-makefiles-under,$(LOCAL_PATH)) |