Merge "Preopt apps with updatable boot classpath too."
diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk
index 7c45646..2762b44 100644
--- a/core/dex_preopt_config.mk
+++ b/core/dex_preopt_config.mk
@@ -47,9 +47,8 @@
     product/app/% \
     product/priv-app/% \
 
-# Global switch control if updatable boot jars are included in dexpreopt.
-# Currently unconditionally set to true, this may change in the future.
-DEX_PREOPT_WITH_UPDATABLE_BCP := false
+# Global switch to control if updatable boot jars are included in dexpreopt.
+DEX_PREOPT_WITH_UPDATABLE_BCP := true
 
 # Conditional to building on linux, as dex2oat currently does not work on darwin.
 ifeq ($(HOST_OS),linux)