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

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

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
parent 4866f087

opengl/libs/Android.mk

+6 −0
Original line number Diff line number Diff line
@@ -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.