aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Marko2018-12-21 09:53:17 -0600
committerNicolas Geoffray2019-01-11 04:27:17 -0600
commite3a2db866142ec00f8e07a2700dddcb5aa99d65d (patch)
treec45138d1ca2cc6f113df3ebd5cfbd35d0605cc37
parent1951e7041644a350ffc80be9ff5754918cf4b5a3 (diff)
downloadplatform-build-e3a2db866142ec00f8e07a2700dddcb5aa99d65d.tar.gz
platform-build-e3a2db866142ec00f8e07a2700dddcb5aa99d65d.tar.xz
platform-build-e3a2db866142ec00f8e07a2700dddcb5aa99d65d.zip
Remove conscrypt from boot image.
But keep it as part of the boot class path and deliver the dex files uncompressed in /system/framework/conscrypt.jar. Test: Pixel 2 XL boots. Bug: 119868597 Change-Id: I41b96a586401d120998be5a111331935030922c6
-rw-r--r--core/dex_preopt_config.mk5
-rw-r--r--core/dex_preopt_libart_boot.mk1
-rw-r--r--core/soong_config.mk3
3 files changed, 6 insertions, 3 deletions
diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk
index 0793516b2..3eaf55bb3 100644
--- a/core/dex_preopt_config.mk
+++ b/core/dex_preopt_config.mk
@@ -1,8 +1,8 @@
1DEX_PREOPT_CONFIG := $(PRODUCT_OUT)/dexpreopt.config 1DEX_PREOPT_CONFIG := $(PRODUCT_OUT)/dexpreopt.config
2 2
3# list of boot classpath jars for dexpreopt 3# list of boot classpath jars for dexpreopt
4DEXPREOPT_BOOT_JARS_MODULES := $(PRODUCT_BOOT_JARS) 4DEXPREOPT_BOOT_JARS_MODULES := $(strip $(filter-out conscrypt,$(PRODUCT_BOOT_JARS)))
5PRODUCT_BOOTCLASSPATH_JARS := $(strip $(DEXPREOPT_BOOT_JARS_MODULES)) 5PRODUCT_BOOTCLASSPATH_JARS := $(strip $(DEXPREOPT_BOOT_JARS_MODULES) $(filter conscrypt,$(PRODUCT_BOOT_JARS)))
6PRODUCT_BOOTCLASSPATH := $(subst $(space),:,$(foreach m,$(PRODUCT_BOOTCLASSPATH_JARS),/system/framework/$(m).jar)) 6PRODUCT_BOOTCLASSPATH := $(subst $(space),:,$(foreach m,$(PRODUCT_BOOTCLASSPATH_JARS),/system/framework/$(m).jar))
7 7
8PRODUCT_SYSTEM_SERVER_CLASSPATH := $(subst $(space),:,$(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),/system/framework/$(m).jar)) 8PRODUCT_SYSTEM_SERVER_CLASSPATH := $(subst $(space),:,$(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),/system/framework/$(m).jar))
@@ -118,6 +118,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true)
118 $(call add_json_list, PreoptBootClassPathDexFiles, $(DEXPREOPT_BOOTCLASSPATH_DEX_FILES)) 118 $(call add_json_list, PreoptBootClassPathDexFiles, $(DEXPREOPT_BOOTCLASSPATH_DEX_FILES))
119 $(call add_json_list, PreoptBootClassPathDexLocations, $(DEXPREOPT_BOOTCLASSPATH_DEX_LOCATIONS)) 119 $(call add_json_list, PreoptBootClassPathDexLocations, $(DEXPREOPT_BOOTCLASSPATH_DEX_LOCATIONS))
120 $(call add_json_list, BootJars, $(PRODUCT_BOOT_JARS)) 120 $(call add_json_list, BootJars, $(PRODUCT_BOOT_JARS))
121 $(call add_json_list, PreoptBootJars, $(DEXPREOPT_BOOT_JARS_MODULES))
121 $(call add_json_list, SystemServerJars, $(PRODUCT_SYSTEM_SERVER_JARS)) 122 $(call add_json_list, SystemServerJars, $(PRODUCT_SYSTEM_SERVER_JARS))
122 $(call add_json_list, SystemServerApps, $(PRODUCT_SYSTEM_SERVER_APPS)) 123 $(call add_json_list, SystemServerApps, $(PRODUCT_SYSTEM_SERVER_APPS))
123 $(call add_json_list, SpeedApps, $(PRODUCT_DEXPREOPT_SPEED_APPS)) 124 $(call add_json_list, SpeedApps, $(PRODUCT_DEXPREOPT_SPEED_APPS))
diff --git a/core/dex_preopt_libart_boot.mk b/core/dex_preopt_libart_boot.mk
index b31f5a847..47a8de871 100644
--- a/core/dex_preopt_libart_boot.mk
+++ b/core/dex_preopt_libart_boot.mk
@@ -113,7 +113,6 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE
113 --android-root=$(PRODUCT_OUT)/system \ 113 --android-root=$(PRODUCT_OUT)/system \
114 --no-inline-from=core-oj.jar \ 114 --no-inline-from=core-oj.jar \
115 --abort-on-hard-verifier-error \ 115 --abort-on-hard-verifier-error \
116 --abort-on-soft-verifier-error \
117 $(PRODUCT_DEX_PREOPT_BOOT_FLAGS) $(ART_BOOT_IMAGE_EXTRA_ARGS) \ 116 $(PRODUCT_DEX_PREOPT_BOOT_FLAGS) $(ART_BOOT_IMAGE_EXTRA_ARGS) \
118 || ( echo "$(DEX2OAT_FAILURE_MESSAGE)" ; false ) 117 || ( echo "$(DEX2OAT_FAILURE_MESSAGE)" ; false )
119 118
diff --git a/core/soong_config.mk b/core/soong_config.mk
index 31c77d4b8..534a5eb99 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -111,6 +111,9 @@ $(call add_json_str, Override_rs_driver, $(OVERRIDE_RS_DRIVER))
111$(call add_json_bool, UncompressPrivAppDex, $(call invert_bool,$(filter true,$(DONT_UNCOMPRESS_PRIV_APPS_DEXS)))) 111$(call add_json_bool, UncompressPrivAppDex, $(call invert_bool,$(filter true,$(DONT_UNCOMPRESS_PRIV_APPS_DEXS))))
112$(call add_json_list, ModulesLoadedByPrivilegedModules, $(PRODUCT_LOADED_BY_PRIVILEGED_MODULES)) 112$(call add_json_list, ModulesLoadedByPrivilegedModules, $(PRODUCT_LOADED_BY_PRIVILEGED_MODULES))
113 113
114$(call add_json_list, BootJars, $(PRODUCT_BOOT_JARS))
115$(call add_json_list, PreoptBootJars, $(DEXPREOPT_BOOT_JARS_MODULES))
116
114$(call add_json_bool, DisableDexPreopt, $(call invert_bool,$(filter true,$(WITH_DEXPREOPT)))) 117$(call add_json_bool, DisableDexPreopt, $(call invert_bool,$(filter true,$(WITH_DEXPREOPT))))
115$(call add_json_list, DisableDexPreoptModules, $(DEXPREOPT_DISABLED_MODULES)) 118$(call add_json_list, DisableDexPreoptModules, $(DEXPREOPT_DISABLED_MODULES))
116$(call add_json_str, DexPreoptProfileDir, $(PRODUCT_DEX_PREOPT_PROFILE_DIR)) 119$(call add_json_str, DexPreoptProfileDir, $(PRODUCT_DEX_PREOPT_PROFILE_DIR))