diff options
| author | Ian Pedowitz <ijpedowitz@google.com> | 2018-01-19 04:21:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-19 04:21:35 +0000 |
| commit | 1993c5618abd342fc82ba93c5ec4062bb079488f (patch) | |
| tree | 0ec722e79e35d50cab7f0f505e8a7af649e68677 | |
| parent | b9b7bfb02f71e94b5e8cb01da7e69cb6a012083b (diff) | |
| parent | 61bab24fa8d46c2b9f7a40bd299eee8c3b2ddeec (diff) | |
Merge "Fixing app compat issue b/72143978" am: 8353a39ecc
am: 61bab24fa8
Change-Id: I6f07f1d9cfd26aa8b93a2563349b5e40effb7a41
| -rw-r--r-- | native/graphics/jni/Android.bp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/native/graphics/jni/Android.bp b/native/graphics/jni/Android.bp index 5785b0c42a2f..d7695ef17a08 100644 --- a/native/graphics/jni/Android.bp +++ b/native/graphics/jni/Android.bp @@ -30,6 +30,13 @@ cc_library_shared { "libandroid_runtime", "libskia", ], + + 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. |