commit c8ada00fea1fd99f2daeb5671acd9037ce808450
author Ulyana Trafimovich <skvadrik@google.com> Wed Nov 27 06:14:42 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 27 06:14:42 2019 -0800
tree d74b92286db4772dcc0a3e9e531ff1ed5114851b
parent 18e7602a073018eb83ad344b74754dc984b98a5b
parent cf126dfb1ad7dada4b338beb29568c5d073f811d

Merge "Revert^2 "Do not dexpreopt system server jars from updatable modules."" am: 28ef4100ac am: 1dd62c175f
am: cf126dfb1a

Change-Id: I32dacb257960fcc048d0da3041d481af7dcb7c61

core/dex_preopt_odex_install.mk

diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index 6705c82..64c9a37 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -58,6 +58,11 @@
   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