diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2015-05-13 22:11:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 22:11:19 +0000 |
| commit | af3a3778c2c17a8064da599bcabb7d141f59f9af (patch) | |
| tree | c5f45f25a68cd3e31e0c1c75ebb24db1217c62e7 /opengl | |
| parent | 6f48c7f3dc1cb71d0345b329b34ae62eb5bfa557 (diff) | |
| parent | ae62e0573a6455db9d1ebcb244f052267710beca (diff) | |
| download | frameworks_native-af3a3778c2c17a8064da599bcabb7d141f59f9af.zip frameworks_native-af3a3778c2c17a8064da599bcabb7d141f59f9af.tar.gz frameworks_native-af3a3778c2c17a8064da599bcabb7d141f59f9af.tar.bz2 | |
Merge "Switch libGLESv1_CM/libGLESv2 to hash-style=both" into mnc-dev
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libs/Android.mk | 6 |
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. |