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

am: 44b94acf3e

Change-Id: I3eba66d7ba56d89c51f0dcce99a2bd0acade2b57
This commit is contained in:
Ulyana Trafimovich 2019-11-26 05:22:17 -08:00 committed by android-build-merger
commit 0678652fda

View file

@ -58,11 +58,6 @@ 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