commit 455f313d5189218f8151d7e0caf89e39220a7b00
author Ryan Prichard <rprichard@google.com> Fri Jan 18 14:06:17 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Jan 18 14:06:17 2019 -0800
tree 04a5e6057858b325acb23d67de23571f2a4c087b
parent f20ee7900d5dc8a62405e1e9176bb5c118110bb6
parent 6fb9f4ceee5a33a41af0f1a4621114c05f7eb187

Merge "Turn off XOM on libnstest_root.so" am: c85a8823ca
am: 6fb9f4ceee

Change-Id: Ic8dd5e33604d8d102cd47becfcd2abbb268ff80a

tests/libs/Android.bp

diff --git a/tests/libs/Android.bp b/tests/libs/Android.bp
index 79c9a06..c06cb12 100644
--- a/tests/libs/Android.bp
+++ b/tests/libs/Android.bp
@@ -237,6 +237,10 @@
         "libnstest_public",
         "libnstest_private",
     ],
+    // The dlext.ns_anonymous test copies the loaded segments of this shared
+    // object into a new mapping, so every segment must be readable. Turn off
+    // eXecute-Only-Memory. See http://b/123034666.
+    xom: false,
 }
 
 cc_test_library {