ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Revert "Remove ART APEX from the bootstrap apexes"" am: 6ba9afd1e9 am: 15de287cfc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4261c67c795e49cfbba1044b5a3d12d617956ae
This commit is contained in:
Bart Sears 2021-02-02 02:43:39 +00:00 • committed by Automerger Merge Worker
commit fb8c06ab94
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
init/service.cpp
View file

@ -127,7 +127,8 @@ static bool ExpandArgsAndExecv(const std::vector<std::string>& args, bool sigsto
static bool AreRuntimeApexesReady() { static bool AreRuntimeApexesReady() {
struct stat buf; 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; unsigned long Service::next_start_order_ = 1;