From 213a7d86d5e3c3568b0a2ed35de1ca775f17b286 Mon Sep 17 00:00:00 2001 From: Ulyana Trafimovich Date: Wed, 27 Nov 2019 12:27:30 +0000 Subject: [PATCH] Revert^2 "Do not dexpreopt system server jars from updatable modules." This reverts commit fa7cf280ca19c4a67742288ee81bd2fc181c1abe. Reason for revert: Build failure is not reproducible. Forrest build on the same build ID 6033773 and same target cf_x86_phone-userdebug_coverage finished successfully. Change-Id: I188623237dfba657fb48966e0a34a975f13d00d2 --- core/dex_preopt_odex_install.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index 6705c8246..64c9a378b 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