summaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
authorGoran Jakovljevic <goran.jakovljevic@imgtec.com>2015-03-10 17:26:01 +0100
committerDmitriy Ivanov <dimitry@google.com>2015-03-10 09:50:51 -0700
commit12f4749df86698170718f80aabf8243b7c55833c (patch)
treeb2d4cefcdb11b3e73e386f5526dcbb516cbd68b7 /native
parent3d333c745f928ca1595aca111d9938fa3cf3e282 (diff)
downloadframeworks_base-12f4749df86698170718f80aabf8243b7c55833c.zip
frameworks_base-12f4749df86698170718f80aabf8243b7c55833c.tar.gz
frameworks_base-12f4749df86698170718f80aabf8243b7c55833c.tar.bz2
Generate gnu hash for arm only
Fixes build failure caused by: https://android-review.googlesource.com/#/c/139670/ As previously discussed [1], MIPS does not support GNU-style ELF hashes. [1] https://android-review.googlesource.com/#/c/49282/2/tests/Android.mk Change-Id: I8edb8a1595308db2ecd1bd6650a069b1224ae64f
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)