summaryrefslogtreecommitdiffstats
path: root/opengl/libs
diff options
context:
space:
mode:
authorDmitriy Ivanov <dimitry@google.com>2015-05-13 15:05:07 -0700
committerDmitriy Ivanov <dimitry@google.com>2015-05-13 15:05:07 -0700
commitae62e0573a6455db9d1ebcb244f052267710beca (patch)
treec10ae5b3ddec2a2b87c359420e19fa0fea2c788a /opengl/libs
parent4866f087181af02e870b2d2fc1d4be8d38c2f36e (diff)
downloadframeworks_native-ae62e0573a6455db9d1ebcb244f052267710beca.zip
frameworks_native-ae62e0573a6455db9d1ebcb244f052267710beca.tar.gz
frameworks_native-ae62e0573a6455db9d1ebcb244f052267710beca.tar.bz2
Switch libGLESv1_CM/libGLESv2 to hash-style=both
Old version of unity uses custom linker to link itself and libmono. The custom linker does not support lookups with gnu-hash style. Switching libraries needed by libunity.so to --hash-style=both fixes this problem. Bug: http://b/20093774 Change-Id: I2a4887cf7a5ee80a8976ecaad54b52dc62518e55
Diffstat (limited to 'opengl/libs')
-rw-r--r--opengl/libs/Android.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk
index 4da9f92..18ad300 100644
--- a/opengl/libs/Android.mk
+++ b/opengl/libs/Android.mk
@@ -86,6 +86,9 @@ 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)
@@ -111,6 +114,9 @@ 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
+
# Symlink libGLESv3.so -> libGLESv2.so
# Platform modules should link against libGLESv2.so (-lGLESv2), but NDK apps
# will be linked against libGLESv3.so.