diff options
author | Nicolas Geoffray | 2019-01-14 02:31:05 -0600 |
---|---|---|
committer | Gerrit Code Review | 2019-01-14 02:31:05 -0600 |
commit | 7769c3459a69453186eeb263928b20b215f00ffc (patch) | |
tree | 3e6602ed4d4f665a2f800c3b9fba594a6df28a12 | |
parent | 04d3c4f6554303cf7055fb261c6a3f43cec0d5a6 (diff) | |
parent | e3a2db866142ec00f8e07a2700dddcb5aa99d65d (diff) | |
download | platform-build-7769c3459a69453186eeb263928b20b215f00ffc.tar.gz platform-build-7769c3459a69453186eeb263928b20b215f00ffc.tar.xz platform-build-7769c3459a69453186eeb263928b20b215f00ffc.zip |
Merge "Remove conscrypt from boot image."
-rw-r--r-- | core/dex_preopt_config.mk | 5 | ||||
-rw-r--r-- | core/dex_preopt_libart_boot.mk | 1 | ||||
-rw-r--r-- | core/soong_config.mk | 3 |
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 @@ | |||
1 | DEX_PREOPT_CONFIG := $(PRODUCT_OUT)/dexpreopt.config | 1 | DEX_PREOPT_CONFIG := $(PRODUCT_OUT)/dexpreopt.config |
2 | 2 | ||
3 | # list of boot classpath jars for dexpreopt | 3 | # list of boot classpath jars for dexpreopt |
4 | DEXPREOPT_BOOT_JARS_MODULES := $(PRODUCT_BOOT_JARS) | 4 | DEXPREOPT_BOOT_JARS_MODULES := $(strip $(filter-out conscrypt,$(PRODUCT_BOOT_JARS))) |
5 | PRODUCT_BOOTCLASSPATH_JARS := $(strip $(DEXPREOPT_BOOT_JARS_MODULES)) | 5 | PRODUCT_BOOTCLASSPATH_JARS := $(strip $(DEXPREOPT_BOOT_JARS_MODULES) $(filter conscrypt,$(PRODUCT_BOOT_JARS))) |
6 | PRODUCT_BOOTCLASSPATH := $(subst $(space),:,$(foreach m,$(PRODUCT_BOOTCLASSPATH_JARS),/system/framework/$(m).jar)) | 6 | PRODUCT_BOOTCLASSPATH := $(subst $(space),:,$(foreach m,$(PRODUCT_BOOTCLASSPATH_JARS),/system/framework/$(m).jar)) |
7 | 7 | ||
8 | PRODUCT_SYSTEM_SERVER_CLASSPATH := $(subst $(space),:,$(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),/system/framework/$(m).jar)) | 8 | PRODUCT_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 58e1a03ae..77329c35f 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)) |