commit eeb1ea86ce0f021205fed0c84b4d4fd98b15bf00
author Chih-Hung Hsieh <chh@google.com> Tue May 22 21:37:08 2018 -0700
committer Chih-Hung Hsieh <chh@google.com> Thu May 24 09:31:50 2018 -0700
tree f63999becb45b668b4286a4372f4845dfe56f1f9
parent ddceca858fb6866fd5f569dc8221675e20bf2ac8

Work around b/24465209, do not pack relocation table.

Global flag --pack-dyn-relocs=android is used with clang lld.
For b/24465209, we need to override that with pack_relocations:false.

Bug: 24465209
Bug: 80093890
Test: build with USE_CLANG_LLD=true and run dlext.compat_elf_hash_and_relocation_tables
Change-Id: I9364feb4070d4f75705d8651d535c792fe6ad6f7

native/graphics/jni/Android.bp

diff --git a/native/graphics/jni/Android.bp b/native/graphics/jni/Android.bp
index d7695ef..ae141be 100644
--- a/native/graphics/jni/Android.bp
+++ b/native/graphics/jni/Android.bp
@@ -34,6 +34,7 @@
     arch: {
         arm: {
             // TODO: This is to work around b/24465209. Remove after root cause is fixed
+            pack_relocations: false,
             ldflags: ["-Wl,--hash-style=both"],
         },
     },