Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b952f42b authored by Dmitriy Ivanov's avatar Dmitriy Ivanov
Browse files

Replace libGLESv3 symlink with shared library 

Because of the link to libGLESv2.so, libGLESv3.so had
incorrect dt_soname, which led to inability to use
in in linker public namespaces.

This change replaces symlink with shared library.

Bug: http://b/25754041
Change-Id: I3743c81f05bc6caf746e40ef7531723e97632a70
parent 4e427f0a

opengl/libs/Android.mk

+29 −10
Original line number Diff line number Diff line
@@ -104,10 +104,11 @@ include $(BUILD_SHARED_LIBRARY) 
include $(CLEAR_VARS)



LOCAL_SRC_FILES:= \

	GLES2/gl2.cpp.arm 	\

	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)