From 741fe84d5665ccb1c74250232ac2a0bb67c0de5c Mon Sep 17 00:00:00 2001 From: Ivan Lozano Date: Wed, 28 Nov 2018 19:07:59 +0000 Subject: [PATCH] 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 | 1 - 1 file changed, 1 deletion(-) diff --git a/init/Android.mk b/init/Android.mk index ee030c76c..dc46d21c5 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -92,7 +92,6 @@ LOCAL_STATIC_LIBRARIES := \ 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)