summaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
authorDmitriy Ivanov <dimitry@google.com>2015-03-10 15:27:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-10 15:27:51 +0000
commit1944667b7f70c336da66cc3fbdee3a2fbd766980 (patch)
treeedbd968475b0de17609c08141e5575562b2b496f /native
parentb6d6c04a717222178184bff135bd12cfc4c019a1 (diff)
parent8ced0357152a9df64c9e21c8f3cec69cc7e8403d (diff)
downloadframeworks_base-1944667b7f70c336da66cc3fbdee3a2fbd766980.zip
frameworks_base-1944667b7f70c336da66cc3fbdee3a2fbd766980.tar.gz
frameworks_base-1944667b7f70c336da66cc3fbdee3a2fbd766980.tar.bz2
am 8ced0357: am 2a88ff2f: Merge "Generate sysv hash for libjnigraphics"
* commit '8ced0357152a9df64c9e21c8f3cec69cc7e8403d': 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)