summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitriy Ivanov <dimitry@google.com>2015-03-10 15:12:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-10 15:12:46 +0000
commit8ced0357152a9df64c9e21c8f3cec69cc7e8403d (patch)
treef0f84a02fbc1e641fec64dd25e8812ce0f95bc38
parent174a44888ec56f688426c80d50b9e0021f47c16f (diff)
parent2a88ff2fe1849a3823962a2c239afdf6339fedc9 (diff)
downloadframeworks_base-8ced0357152a9df64c9e21c8f3cec69cc7e8403d.zip
frameworks_base-8ced0357152a9df64c9e21c8f3cec69cc7e8403d.tar.gz
frameworks_base-8ced0357152a9df64c9e21c8f3cec69cc7e8403d.tar.bz2
am 2a88ff2f: Merge "Generate sysv hash for libjnigraphics"
* commit '2a88ff2fe1849a3823962a2c239afdf6339fedc9': Generate sysv hash for libjnigraphics
-rw-r--r--native/graphics/jni/Android.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/native/graphics/jni/Android.mk b/native/graphics/jni/Android.mk
index 88954f0..14575ee 100644
--- a/native/graphics/jni/Android.mk
+++ b/native/graphics/jni/Android.mk
@@ -30,5 +30,8 @@ LOCAL_MODULE:= libjnigraphics
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
+# TODO: This is to work around b/19059885. Remove after root cause is fixed
+LOCAL_LDFLAGS := -Wl,--hash-style=both
+
include $(BUILD_SHARED_LIBRARY)