Merge "Revert "Remove ART APEX from the bootstrap apexes""

This commit is contained in:
Bart Sears 2021-02-02 01:11:38 +00:00 committed by Gerrit Code Review
commit 6ba9afd1e9

View file

@ -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;