Merge "Remove ART APEX from the bootstrap apexes"

Treehugger Robot · Gerrit Code Review · commit dfab4161885b · 2021-01-30T03:14:03.000Z
diff --git a/init/service.cpp b/init/service.cpp
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -127,8 +127,7 @@ static bool ExpandArgsAndExecv(const std::vector<std::string>& args, bool sigsto`
`127`	`127`
`128`	`128`	`static bool AreRuntimeApexesReady() {`
`129`	`129`	`struct stat buf;`
`130`		`- return stat("/apex/com.android.art/", &buf) == 0 &&`
`131`		`- stat("/apex/com.android.runtime/", &buf) == 0;`
	`130`	`+ return stat("/apex/com.android.runtime/", &buf) == 0;`
`132`	`131`	`}`
`133`	`132`
`134`	`133`	`unsigned long Service::next_start_order_ = 1;`