summaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
authorDmitriy Ivanov <dimitry@google.com>2015-03-13 21:50:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-13 21:50:47 +0000
commit1c8b3778e1c380992a9ca96e965cdc4e6f3bca66 (patch)
tree372aa2b4d785acc4d7e54488d648037f98491fa9 /native
parent83b96e02a4bc8b0e9f5308b441609411ee347baf (diff)
parent9aeb080eec2286e8604901bd2b8248be4e527107 (diff)
downloadframeworks_base-1c8b3778e1c380992a9ca96e965cdc4e6f3bca66.zip
frameworks_base-1c8b3778e1c380992a9ca96e965cdc4e6f3bca66.tar.gz
frameworks_base-1c8b3778e1c380992a9ca96e965cdc4e6f3bca66.tar.bz2
am 9aeb080e: Merge "Switch libjnigraphics to sysv-only hash style"
* commit '9aeb080eec2286e8604901bd2b8248be4e527107': Switch libjnigraphics to sysv-only hash style
Diffstat (limited to 'native')
-rw-r--r--native/graphics/jni/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/native/graphics/jni/Android.mk b/native/graphics/jni/Android.mk
index b7f0fbd..91c9ac6 100644
--- a/native/graphics/jni/Android.mk
+++ b/native/graphics/jni/Android.mk
@@ -31,7 +31,7 @@ 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_arm := -Wl,--hash-style=both
+LOCAL_LDFLAGS_arm := -Wl,--hash-style=sysv
include $(BUILD_SHARED_LIBRARY)