diff options
author | Dan Willemsen <dwillemsen@google.com> | 2019-02-11 06:57:41 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-02-11 06:57:41 -0800 |
commit | 8964c882f563a74485e335a218747752bfab3281 (patch) | |
tree | 569571d8b735ffc9061a3a9b22697750c6e321f7 | |
parent | 8dd92bbdf368a97a4de2f153043b13a5f36c4b34 (diff) | |
parent | e2c93962830acc70ef0cf43dd7b62a91f6313d56 (diff) | |
download | native-8964c882f563a74485e335a218747752bfab3281.tar.gz |
Merge "Convert libGLES_android to Android.bp"
am: e2c9396283
Change-Id: I12db81b790db898ab0adb4aa6c17293961397902
-rw-r--r-- | opengl/libagl/Android.bp | 99 | ||||
-rw-r--r-- | opengl/libagl/Android.mk | 49 |
2 files changed, 99 insertions, 49 deletions
diff --git a/opengl/libagl/Android.bp b/opengl/libagl/Android.bp new file mode 100644 index 0000000000..6ec24b3712 --- /dev/null +++ b/opengl/libagl/Android.bp @@ -0,0 +1,99 @@ +// +// Build the software OpenGL ES library +// + +cc_defaults { + name: "libGLES_android_defaults", + + cflags: [ + "-DLOG_TAG=\"libagl\"", + "-DGL_GLEXT_PROTOTYPES", + "-DEGL_EGLEXT_PROTOTYPES", + "-fvisibility=hidden", + "-Wall", + "-Werror", + ], + + shared_libs: [ + "libcutils", + "libhardware", + "libutils", + "liblog", + "libpixelflinger", + "libETC1", + "libui", + "libnativewindow", + ], + + // we need to access the private Bionic header <bionic_tls.h> + include_dirs: ["bionic/libc/private"], + + arch: { + arm: { + cflags: ["-fstrict-aliasing"], + }, + + mips: { + cflags: [ + "-fstrict-aliasing", + // The graphics code can generate division by zero + "-mno-check-zero-division", + ], + }, + }, +} + +cc_library_shared { + name: "libGLES_android", + defaults: ["libGLES_android_defaults"], + + whole_static_libs: ["libGLES_android_arm"], + + srcs: [ + "egl.cpp", + "state.cpp", + "texture.cpp", + "Tokenizer.cpp", + "TokenManager.cpp", + "TextureObjectManager.cpp", + "BufferObjectManager.cpp", + ], + + arch: { + arm: { + srcs: [ + "fixed_asm.S", + "iterators.S", + ], + }, + + mips: { + rev6: { + srcs: ["arch-mips/fixed_asm.S"], + }, + }, + }, + + relative_install_path: "egl", +} + +cc_library_static { + name: "libGLES_android_arm", + defaults: ["libGLES_android_defaults"], + + srcs: [ + "array.cpp", + "fp.cpp", + "light.cpp", + "matrix.cpp", + "mipmap.cpp", + "primitives.cpp", + "vertex.cpp", + ], + + arch: { + arm: { + instruction_set: "arm", + }, + }, +} diff --git a/opengl/libagl/Android.mk b/opengl/libagl/Android.mk deleted file mode 100644 index 15a12e458d..0000000000 --- a/opengl/libagl/Android.mk +++ /dev/null @@ -1,49 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -# -# Build the software OpenGL ES library -# - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - egl.cpp \ - state.cpp \ - texture.cpp \ - Tokenizer.cpp \ - TokenManager.cpp \ - TextureObjectManager.cpp \ - BufferObjectManager.cpp \ - array.cpp.arm \ - fp.cpp.arm \ - light.cpp.arm \ - matrix.cpp.arm \ - mipmap.cpp.arm \ - primitives.cpp.arm \ - vertex.cpp.arm - -LOCAL_CFLAGS += -DLOG_TAG=\"libagl\" -LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES -LOCAL_CFLAGS += -fvisibility=hidden - -LOCAL_SHARED_LIBRARIES := libcutils libhardware libutils liblog libpixelflinger libETC1 libui libnativewindow - -LOCAL_SRC_FILES_arm += fixed_asm.S iterators.S -LOCAL_CFLAGS_arm += -fstrict-aliasing - -ifndef ARCH_MIPS_REV6 -LOCAL_SRC_FILES_mips += arch-mips/fixed_asm.S -endif -LOCAL_CFLAGS_mips += -fstrict-aliasing -# The graphics code can generate division by zero -LOCAL_CFLAGS_mips += -mno-check-zero-division - -LOCAL_CFLAGS += -Wall -Werror - -# we need to access the private Bionic header <bionic_tls.h> -LOCAL_C_INCLUDES += bionic/libc/private - -LOCAL_MODULE_RELATIVE_PATH := egl -LOCAL_MODULE:= libGLES_android - -include $(BUILD_SHARED_LIBRARY) |