diff options
| author | Ulyana Trafimovich <skvadrik@google.com> | 2019-11-26 02:26:32 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-26 02:26:32 -0800 |
| commit | 6ff6d78fb57f58a0971c115e5de3d078fae85fb9 (patch) | |
| tree | 24ef5542169367a6cbccbc16d8497991747118eb | |
| parent | 7b3a7105e52ef8d11a9e10119dcd9f8c9a0d192a (diff) | |
| parent | 51833931af7670a849fb7ba240e26f48f9fda140 (diff) | |
| download | build-6ff6d78fb57f58a0971c115e5de3d078fae85fb9.tar.gz | |
Merge "Do not dexpreopt system server jars from updatable modules."
am: 51833931af
Change-Id: Ia4ccc35c1b281a1c2732d963dbe29ec454367cfe
| -rw-r--r-- | core/dex_preopt_odex_install.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index 6705c82463..64c9a378b1 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -58,6 +58,11 @@ ifeq (,$(strip $(built_dex)$(my_prebuilt_src_file)$(LOCAL_SOONG_DEX_JAR))) # con 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 |