Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fb6a949 authored by Ulya Trafimovich's avatar Ulya Trafimovich
Browse files

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
parent 1567472f

core/dex_preopt_odex_install.mk

+5 −0
Original line number Original line Diff line number Diff line
@@ -58,6 +58,11 @@ ifeq (,$(strip $(built_dex)$(my_prebuilt_src_file)$(LOCAL_SOONG_DEX_JAR))) # con 
  LOCAL_DEX_PREOPT :=

  LOCAL_DEX_PREOPT :=

endif

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

# 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

# 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

# /data. If we don't do this they will need to be extracted which is not favorable for RAM usage