commit b1de00c4db0d0525381222b527253f064b9c80f8
author Ivan Lozano <ivanlozano@google.com> Wed Nov 28 19:07:59 2018 +0000
committer Ivan Lozano <ivanlozano@google.com> Wed Nov 28 19:07:59 2018 +0000
tree 4e70073db4345fd69bd44554bff6b9c4ad92809a
parent 332ac551a1b3775fd3b656c9d9e1884014a786a0

Revert "Disable XOM in init."

This reverts commit 055347e56411b15f9b119b87c29938411ce4c69a.

Reason for revert:
init boots with XOM now. I think this was fixed when this boringssl patch got merged in earlier this week (init has a static dependency on libcrypto):
https://boringssl-review.googlesource.com/c/boringssl/+/33245

Change-Id: I70e15fad4a194c0d2087941bba70dfcd38abe8b5

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index ee030c7..dc46d21 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -92,7 +92,6 @@
 LOCAL_SANITIZE := signed-integer-overflow
 # First stage init is weird: it may start without stdout/stderr, and no /proc.
 LOCAL_NOSANITIZE := hwaddress
-LOCAL_XOM := false
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)