From ae62e0573a6455db9d1ebcb244f052267710beca Mon Sep 17 00:00:00 2001 From: Dmitriy Ivanov Date: Wed, 13 May 2015 15:05:07 -0700 Subject: [PATCH] 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 --- opengl/libs/Android.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk index 4da9f92a9..18ad3003e 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.