summaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
authorDmitriy Ivanov <dimitry@google.com>2015-03-11 00:23:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-11 00:23:26 +0000
commitae0d6f34c5b06063467a934f7d533b741ed48f6b (patch)
tree3e6a8b7b3db3b1e59c1d60ffdcb9a6ef35f5bb67 /native
parent8ccfe899a7b7edebf776584d0e32139cc990c8d5 (diff)
parent1944667b7f70c336da66cc3fbdee3a2fbd766980 (diff)
downloadframeworks_base-ae0d6f34c5b06063467a934f7d533b741ed48f6b.zip
frameworks_base-ae0d6f34c5b06063467a934f7d533b741ed48f6b.tar.gz
frameworks_base-ae0d6f34c5b06063467a934f7d533b741ed48f6b.tar.bz2
am 1944667b: am 8ced0357: am 2a88ff2f: Merge "Generate sysv hash for libjnigraphics"
* commit '1944667b7f70c336da66cc3fbdee3a2fbd766980': Generate sysv hash for libjnigraphics
Diffstat (limited to 'native')
-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)