summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Pedowitz <ijpedowitz@google.com>2018-01-19 05:35:27 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-01-19 05:35:27 +0000
commit1cd8b5c6cb30e9bf66590c2290348b2676207fb1 (patch)
tree787920d0bcf6a977578806dbc8571c9378f298e6
parent52062b1f93b64677bc377cd63951a0672dd080e9 (diff)
parent1993c5618abd342fc82ba93c5ec4062bb079488f (diff)
Merge "Fixing app compat issue b/72143978" am: 8353a39ecc am: 61bab24fa8
am: 1993c5618a Change-Id: If6e67a008d02dc561982583a3819de1ef3e06e46
-rw-r--r--native/graphics/jni/Android.bp7
1 files changed, 7 insertions, 0 deletions
diff --git a/native/graphics/jni/Android.bp b/native/graphics/jni/Android.bp
index 61164e068da6..0704e3545b62 100644
--- a/native/graphics/jni/Android.bp
+++ b/native/graphics/jni/Android.bp
@@ -29,6 +29,13 @@ cc_library_shared {
shared_libs: [
"libandroid_runtime",
],
+
+ arch: {
+ arm: {
+ // TODO: This is to work around b/24465209. Remove after root cause is fixed
+ ldflags: ["-Wl,--hash-style=both"],
+ },
+ },
}
// The headers module is in frameworks/native/Android.bp.