diff options
| author | Ulya Trafimovich <skvadrik@google.com> | 2019-11-25 15:11:57 +0000 |
|---|---|---|
| committer | Ulya Trafimovich <skvadrik@google.com> | 2019-11-25 16:36:52 +0000 |
| commit | 3fb6a949a660835fb034230c6a991d0b45f773bf (patch) | |
| tree | d49eb644431d25f8bc5e638eb4588debf1f60205 | |
| parent | 1567472ff9001d0cbe8a213e78fa3000306ec121 (diff) | |
| download | build-3fb6a949a660835fb034230c6a991d0b45f773bf.tar.gz | |
Do not dexpreopt system server jars from updatable modules.
Test: m
Test: The list of updatable system server jars is empty now,
so I tested that the filer works with a manual experiment:
- temporarily add wifi-service to PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS
- m nothing
- fgrep -e 'wifi-service dexpreopt' $ANDROID_BUILD_TOP/out/build-$TARGET_PRODUCT.ninja
- expect empty output (no dexpreopt command is generated)
Change-Id: Ia4206ccc263b535b6e39b54c6e8db28845ff2bf5
| -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 |