Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7769c345 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by Gerrit Code Review
Browse files

Merge "Remove conscrypt from boot image."

parents 04d3c4f6 e3a2db86

core/dex_preopt_config.mk

+3 −2
Original line number Diff line number Diff line 
DEX_PREOPT_CONFIG := $(PRODUCT_OUT)/dexpreopt.config



# list of boot classpath jars for dexpreopt

DEXPREOPT_BOOT_JARS_MODULES := $(PRODUCT_BOOT_JARS)

PRODUCT_BOOTCLASSPATH_JARS := $(strip $(DEXPREOPT_BOOT_JARS_MODULES))

DEXPREOPT_BOOT_JARS_MODULES := $(strip $(filter-out conscrypt,$(PRODUCT_BOOT_JARS)))

PRODUCT_BOOTCLASSPATH_JARS := $(strip $(DEXPREOPT_BOOT_JARS_MODULES) $(filter conscrypt,$(PRODUCT_BOOT_JARS)))

PRODUCT_BOOTCLASSPATH := $(subst $(space),:,$(foreach m,$(PRODUCT_BOOTCLASSPATH_JARS),/system/framework/$(m).jar))



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) 
  $(call add_json_list, PreoptBootClassPathDexFiles,        $(DEXPREOPT_BOOTCLASSPATH_DEX_FILES))

  $(call add_json_list, PreoptBootClassPathDexLocations,    $(DEXPREOPT_BOOTCLASSPATH_DEX_LOCATIONS))

  $(call add_json_list, BootJars,                           $(PRODUCT_BOOT_JARS))

  $(call add_json_list, PreoptBootJars,                     $(DEXPREOPT_BOOT_JARS_MODULES))

  $(call add_json_list, SystemServerJars,                   $(PRODUCT_SYSTEM_SERVER_JARS))

  $(call add_json_list, SystemServerApps,                   $(PRODUCT_SYSTEM_SERVER_APPS))

  $(call add_json_list, SpeedApps,                          $(PRODUCT_DEXPREOPT_SPEED_APPS))

core/dex_preopt_libart_boot.mk

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE 
		--android-root=$(PRODUCT_OUT)/system \

		--no-inline-from=core-oj.jar \

		--abort-on-hard-verifier-error \

		--abort-on-soft-verifier-error \

		$(PRODUCT_DEX_PREOPT_BOOT_FLAGS) $(ART_BOOT_IMAGE_EXTRA_ARGS) \

		|| ( echo "$(DEX2OAT_FAILURE_MESSAGE)" ; false )

core/soong_config.mk

+3 −0
Original line number Diff line number Diff line
@@ -111,6 +111,9 @@ $(call add_json_str, Override_rs_driver, $(OVERRIDE_RS_DRIVER)) 
$(call add_json_bool, UncompressPrivAppDex,              $(call invert_bool,$(filter true,$(DONT_UNCOMPRESS_PRIV_APPS_DEXS))))

$(call add_json_list, ModulesLoadedByPrivilegedModules,  $(PRODUCT_LOADED_BY_PRIVILEGED_MODULES))



$(call add_json_list, BootJars,                          $(PRODUCT_BOOT_JARS))

$(call add_json_list, PreoptBootJars,                    $(DEXPREOPT_BOOT_JARS_MODULES))



$(call add_json_bool, DisableDexPreopt,                  $(call invert_bool,$(filter true,$(WITH_DEXPREOPT))))

$(call add_json_list, DisableDexPreoptModules,           $(DEXPREOPT_DISABLED_MODULES))

$(call add_json_str,  DexPreoptProfileDir,               $(PRODUCT_DEX_PREOPT_PROFILE_DIR))