commit 6d869dd6abb2dab2997ec8344948cffd8928521b
author chapin <chapin@google.com> Mon Feb 01 22:29:59 2021 +0000
committer chapin <chapin@google.com> Mon Feb 01 22:29:59 2021 +0000
tree face6f7a4e85e4b2ba6805a8a2bf1e826146fa00
parent b99c12ef10dc52f25e87e148fa86484b5d4d8e1b

Revert "Remove ART APEX from the bootstrap apexes"

Revert submission 1563392-remove_art_from_bootstrap

Reason for revert: Bug: 179002105
Reverted Changes:
I65e2a2089:Remove ART APEX from the bootstrap apexes
Ic20df80e2:Remove ART APEX from the bootstrap apexes

Change-Id: I474ab95805c5ca28e0bba91f3d226e8db5a7a9ea

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index cfb8284..f6ce094 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -127,7 +127,8 @@
 
 static bool AreRuntimeApexesReady() {
     struct stat buf;
-    return stat("/apex/com.android.runtime/", &buf) == 0;
+    return stat("/apex/com.android.art/", &buf) == 0 &&
+           stat("/apex/com.android.runtime/", &buf) == 0;
 }
 
 unsigned long Service::next_start_order_ = 1;