summaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
authorDimitry Ivanov <dimitry@google.com>2015-03-10 17:21:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-10 17:21:32 +0000
commit3b9cfe30ed4ae34d06a8f005c8ada593c314316b (patch)
tree2049be6b55b8112649d5a45be55c2a8de16e8154 /native
parent91239a0b738a503ab0f4ed4111e1b5f81d927e38 (diff)
parenta6ed1b9547dcd592031a415739cc7e672c068f7c (diff)
downloadframeworks_base-3b9cfe30ed4ae34d06a8f005c8ada593c314316b.zip
frameworks_base-3b9cfe30ed4ae34d06a8f005c8ada593c314316b.tar.gz
frameworks_base-3b9cfe30ed4ae34d06a8f005c8ada593c314316b.tar.bz2
am a6ed1b95: am 6e116429: Merge "Generate gnu hash for arm only"
* commit 'a6ed1b9547dcd592031a415739cc7e672c068f7c': Generate gnu hash for arm only
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 14575ee..b7f0fbd 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 := -Wl,--hash-style=both
+LOCAL_LDFLAGS_arm := -Wl,--hash-style=both
include $(BUILD_SHARED_LIBRARY)