commit d09648e6c0b994d6a1901fedcec49ed84ac7bf8c
author Ulyana Trafimovich <skvadrik@google.com> Tue Nov 26 02:31:25 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Nov 26 02:31:25 2019 -0800
tree d83040f19338a62af7c6d5c0a6a1e53eb3186bdc
parent 190b955f879d60dad0eaeb27510f16585b9b08b5
parent a36b594f01f4ac198aa7a933348e7e82eb224333

Merge "Do not dexpreopt system server jars from updatable modules." am: 51833931af am: 6ff6d78fb5
am: a36b594f01

Change-Id: Ic1b5c1414b8fbf97199625d6d40cf716ad91d4b6

core/dex_preopt_odex_install.mk

diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index 6705c82..64c9a37 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -58,6 +58,11 @@
   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