Merge "Revert^2 "Remove ART APEX from the bootstrap apexes"" am: acc82258cc am: 15108cd4a6

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1581185

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6846b4c09d601ca10eaf3b957bba7d62655881a3
This commit is contained in:
Treehugger Robot 2021-02-23 02:17:22 +00:00 committed by Automerger Merge Worker
commit 059cf3a6ab

View file

@ -127,8 +127,7 @@ static bool ExpandArgsAndExecv(const std::vector<std::string>& args, bool sigsto
static bool AreRuntimeApexesReady() {
struct stat buf;
return stat("/apex/com.android.art/", &buf) == 0 &&
stat("/apex/com.android.runtime/", &buf) == 0;
return stat("/apex/com.android.runtime/", &buf) == 0;
}
unsigned long Service::next_start_order_ = 1;