Merge "Work around b/24465209, do not pack relocation table." am: d01890df3c am: d7f77b5a12

am: 618e17473c Change-Id: I5a09847436a0608942c9c5636d807d7a984def73
2018-05-24 21:02:54 -07:00
parent ffc7674de6 618e17473c
commit f67d034bb1
1 changed files with 1 additions and 0 deletions
--- a/native/graphics/jni/Android.bp
+++ b/native/graphics/jni/Android.bp
@@ -33,6 +33,7 @@ cc_library_shared {
    arch: {
        arm: {
            // TODO: This is to work around b/24465209. Remove after root cause is fixed
+            pack_relocations: false,
            ldflags: ["-Wl,--hash-style=both"],
        },
    },