Merge "Remove XOM properties."
diff --git a/linker/Android.bp b/linker/Android.bp
index a411a90..4be080b 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -324,7 +324,6 @@
},
compile_multilib: "both",
- xom: false,
recovery_available: true,
apex_available: [
diff --git a/tests/libs/Android.bp b/tests/libs/Android.bp
index 06c090c..c427282 100644
--- a/tests/libs/Android.bp
+++ b/tests/libs/Android.bp
@@ -333,10 +333,6 @@
"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 {