From 6d869dd6abb2dab2997ec8344948cffd8928521b Mon Sep 17 00:00:00 2001
From: chapin <chapin@google.com>
Date: Mon, 1 Feb 2021 22:29:59 +0000
Subject: [PATCH] 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/init/service.cpp b/init/service.cpp
index cfb82842d..f6ce094ef 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -127,7 +127,8 @@ static bool ExpandArgsAndExecv(const std::vector<std::string>& args, bool sigsto
 
 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;