commit b96fdce40503c845a3bc5b932de1e3fb5906b41f
author Jooyung Han <jooyung@google.com> Tue Oct 15 09:21:19 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 15 09:21:19 2019 +0000
tree c590fc764646d66a39e44e78f838606709c523da
parent 6ed9ccdeaa0e5bc44217826fc5958ebddd83d2c1
parent 32fb8dd906956ea5d1e659182e164a5a3d71e54b

Merge "Make VNDK APEX as bootstrap APEX"

apexd/apexd.cpp

diff --git a/apexd/apexd.cpp b/apexd/apexd.cpp
index 8693384..1ac7edc 100644
--- a/apexd/apexd.cpp
+++ b/apexd/apexd.cpp
@@ -118,12 +118,19 @@
 static constexpr size_t kLoopDeviceSetupAttempts = 3u;
 
 bool gBootstrap = false;
-static const std::vector<const std::string> kBootstrapApexes = {
-    "com.android.art",
-    "com.android.i18n",
-    "com.android.runtime",
-    "com.android.tzdata",
-};
+static const std::vector<std::string> kBootstrapApexes = ([]() {
+  std::vector<std::string> ret = {
+      "com.android.art",
+      "com.android.i18n",
+      "com.android.runtime",
+      "com.android.tzdata",
+  };
+
+  if (auto ver = android::base::GetProperty("ro.vndk.version", ""); ver != "") {
+    ret.push_back("com.android.vndk.v" + ver);
+  }
+  return ret;
+})();
 
 static constexpr const int kNumRetriesWhenCheckpointingEnabled = 1;