commit 0cbf5c6362e1e24d5e01f960bd463f90aa7bb14e
author Vladimir Marko <vmarko@google.com> Tue Feb 12 06:02:12 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Feb 12 06:02:12 2019 -0800
tree 8e3e7f72499e56a5c0c5ad09dc24c28134bb1d74
parent a88c1df41c593524e0f8a637b1ec534edcd3f423
parent 85a962e5f488485dc630b361f5fc84a8db1dc2d5

Merge "Clear BOOTCLASSPATH for APP AOT compilation." am: 96602ece01
am: 85a962e5f4

Change-Id: Iaff89cb278f7fa4df3bbfd831dbede5bcb5f0681

cmds/installd/dexopt.cpp

diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index a639951..852aa79 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -1958,6 +1958,11 @@
         /* child -- drop privileges before continuing */
         drop_capabilities(uid);
 
+        // Clear BOOTCLASSPATH.
+        // Let dex2oat use the BCP from boot image, excluding updatable BCP
+        // modules for AOT to avoid app recompilation after their upgrades.
+        unsetenv("BOOTCLASSPATH");
+
         SetDex2OatScheduling(boot_complete);
         if (flock(out_oat_fd.get(), LOCK_EX | LOCK_NB) != 0) {
             PLOG(ERROR) << "flock(" << out_oat_path << ") failed";