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

Commit f1abf04c authored by Calin Juravle's avatar Calin Juravle Committed by android-build-merger
Browse files

Merge "Create dist for boot and system jars" into pi-dev am: 42293db3 

am: b657d5ce

Change-Id: I74025b5e430e4651a38301c2d29a52935f199c0d
parents 9a00a31b b657d5ce

core/dex_preopt.mk

+17 −0
Original line number Diff line number Diff line
@@ -89,3 +89,20 @@ DEXPREOPT_ONE_FILE_DEPENDENCY_BUILT_BOOT_PREOPT := $(DEFAULT_DEX_PREOPT_BUILT_IM 
ifdef TARGET_2ND_ARCH

$(TARGET_2ND_ARCH_VAR_PREFIX)DEXPREOPT_ONE_FILE_DEPENDENCY_BUILT_BOOT_PREOPT := $($(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME)

endif  # TARGET_2ND_ARCH



ifeq ($(PRODUCT_DIST_BOOT_AND_SYSTEM_JARS),true)

boot_profile_jars_zip := $(PRODUCT_OUT)/boot_profile_jars.zip

all_boot_jars := \

  $(foreach m,$(DEXPREOPT_BOOT_JARS_MODULES),$(PRODUCT_OUT)/system/framework/$(m).jar) \

  $(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),$(PRODUCT_OUT)/system/framework/$(m).jar)



$(boot_profile_jars_zip): PRIVATE_JARS := $(all_boot_jars)

$(boot_profile_jars_zip): $(all_boot_jars) $(SOONG_ZIP)

	echo "Create boot profiles package: $@"

	rm -f $@

	$(SOONG_ZIP) -o $@ -C $(PRODUCT_OUT) $(PRIVATE_JARS)



droidcore: $(boot_profile_jars_zip)



$(call dist-for-goals, droidcore, $(boot_profile_jars_zip))

endif

target/product/profile_boot_common.mk

+2 −0
Original line number Diff line number Diff line
@@ -41,3 +41,5 @@ PRODUCT_PROPERTY_OVERRIDES += \ 


# Use speed compiler filter since system server doesn't have JIT.

PRODUCT_DEX_PREOPT_BOOT_FLAGS += --compiler-filter=speed



PRODUCT_DIST_BOOT_AND_SYSTEM_JARS := true