commit 0678652fda6af7e0c11e7f6b4617605fce3d8ed0
author Ulyana Trafimovich <skvadrik@google.com> Tue Nov 26 05:22:17 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Nov 26 05:22:17 2019 -0800
tree c45a00b8313986bef4b2a006f303f2ee3d8f6ee7
parent a36b594f01f4ac198aa7a933348e7e82eb224333
parent 44b94acf3e0b2e2573451f914b9d23e2e453caaf

Merge "Revert "Do not dexpreopt system server jars from updatable modules."" am: b5dd40ed2b
am: 44b94acf3e

Change-Id: I3eba66d7ba56d89c51f0dcce99a2bd0acade2b57

core/dex_preopt_odex_install.mk

diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index 64c9a37..6705c82 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -58,11 +58,6 @@
   LOCAL_DEX_PREOPT :=
 endif
 
-# Don't preopt system server jars that are updatable.
-ifneq (,$(filter %:$(LOCAL_MODULE), $(PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS)))
-  LOCAL_DEX_PREOPT :=
-endif
-
 # if WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true and module is not in boot class path skip
 # Also preopt system server jars since selinux prevents system server from loading anything from
 # /data. If we don't do this they will need to be extracted which is not favorable for RAM usage