diff options
| author | Dimitry Ivanov <dimitry@google.com> | 2015-12-07 23:16:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-07 23:16:20 +0000 |
| commit | bc432368f410d628d21435c9f8fbcdf6bb68ef95 (patch) | |
| tree | 7f665932506aeb010b5001624cb09b2f95fc32ac | |
| parent | 9bb03731ee1f01abbc193a75ea08d632fbb2f81b (diff) | |
| parent | 18ff6557667f3d130ad1f83e04f3b175f8b8cf6d (diff) | |
| download | native-bc432368f410d628d21435c9f8fbcdf6bb68ef95.tar.gz | |
Merge "Replace libGLESv3 symlink with shared library"
am: 18ff655766
* commit '18ff6557667f3d130ad1f83e04f3b175f8b8cf6d':
Replace libGLESv3 symlink with shared library
| -rw-r--r-- | opengl/libs/Android.mk | 39 |
1 files changed, 29 insertions, 10 deletions
diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk index 7fb0f77d1e..f389c9493b 100644 --- a/opengl/libs/Android.mk +++ b/opengl/libs/Android.mk @@ -103,11 +103,12 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -LOCAL_SRC_FILES:= \ - GLES2/gl2.cpp.arm \ +LOCAL_SRC_FILES:= \ + GLES2/gl2.cpp \ # LOCAL_CLANG := false +LOCAL_ARM_MODE := arm LOCAL_SHARED_LIBRARIES += libcutils libutils liblog libEGL LOCAL_MODULE:= libGLESv2 @@ -122,14 +123,32 @@ 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 -# Symlink libGLESv3.so -> libGLESv2.so -# Platform modules should link against libGLESv2.so (-lGLESv2), but NDK apps -# will be linked against libGLESv3.so. -# Note we defer the evaluation of the LOCAL_POST_INSTALL_CMD, -# so $(LOCAL_INSTALLED_MODULE) will be expanded to correct value, -# even for both 32-bit and 64-bit installed files in multilib build. -LOCAL_POST_INSTALL_CMD = \ - $(hide) ln -sf $(notdir $(LOCAL_INSTALLED_MODULE)) $(dir $(LOCAL_INSTALLED_MODULE))libGLESv3.so +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_CLANG := false +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) |