aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlyana Trafimovich <skvadrik@google.com>2019-11-26 13:04:07 +0000
committerUlyana Trafimovich <skvadrik@google.com>2019-11-26 13:06:13 +0000
commitfa7cf280ca19c4a67742288ee81bd2fc181c1abe (patch)
tree649adc3f85b088612bcfe44e26974afeda6272f8
parent3fb6a949a660835fb034230c6a991d0b45f773bf (diff)
downloadbuild-fa7cf280ca19c4a67742288ee81bd2fc181c1abe.tar.gz
Revert "Do not dexpreopt system server jars from updatable modules."
This reverts commit 3fb6a949a660835fb034230c6a991d0b45f773bf. Reason for revert: broken build git_master/cf_x86_phone-userdebug_coverage (likely caused by these changes). Exempt-From-Owner-Approval: revert. Change-Id: Ib72fe0395fd084e774d25ee783b7380395f9d9bd
-rw-r--r--core/dex_preopt_odex_install.mk5
1 files changed, 0 insertions, 5 deletions
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index 64c9a378b1..6705c82463 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -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