commit c383869de45e5ac1c681865b53c6208d2184c104
author chapin <chapin@google.com> Mon Feb 01 22:29:59 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Feb 02 02:39:42 2021 +0000
tree 4ebca7c7ebfd802333ebd162ff2b699f86809f69
parent 2f2200d47c009ad5281de5d62432bf2ca3427267

Revert "Remove ART APEX from the bootstrap apexes"

Revert "Remove ART APEX from the bootstrap apexes"

Revert submission 1563392-remove_art_from_bootstrap

Reason for revert: Bug: 179002105
Reverted Changes:
I65e2a2089:Remove ART APEX from the bootstrap apexes
Ic20df80e2:Remove ART APEX from the bootstrap apexes

Change-Id: I4b650782a9c5946065304c47d98372e41fb1800a
(cherry picked from commit e6b64c204f6beaf2e5caf2dd450cf4bc4e83f504)

apexd/apexd.cpp

diff --git a/apexd/apexd.cpp b/apexd/apexd.cpp
index 7463717..441b2f7 100644
--- a/apexd/apexd.cpp
+++ b/apexd/apexd.cpp
@@ -122,6 +122,7 @@
 // Please DO NOT add new modules to this list without contacting mainline-modularization@ first.
 static const std::vector<std::string> kBootstrapApexes = ([]() {
   std::vector<std::string> ret = {
+      "com.android.art",
       "com.android.i18n",
       "com.android.runtime",
       "com.android.tzdata",