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

Commit 779fbde9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "cherrypicker-L60200000961213913:N41200001377797274"... 

Merge changes from topic "cherrypicker-L60200000961213913:N41200001377797274" into udc-dev am: d833e73b

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23659845



Change-Id: I5cb961e5a5d44e12389fed436c6d443ebf921430
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 85f5c6ec d833e73b

core/dex_preopt.mk

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ booclasspath_locations_arg := $(subst $(space),:,$(DEXPREOPT_BOOTCLASSPATH_DEX_L 
boot_images := $(subst :,$(space),$(DEXPREOPT_IMAGE_LOCATIONS_ON_DEVICE$(DEXPREOPT_INFIX)))

boot_image_arg := $(subst $(space),:,$(patsubst /%,%,$(boot_images)))



boot_zip_metadata_txt := $(boot_zip).METADATA.txt

boot_zip_metadata_txt := $(dir $(boot_zip))boot_zip/METADATA.txt

$(boot_zip_metadata_txt):

	rm -f $@

	echo "booclasspath = $(booclasspath_arg)" >> $@
@@ -112,7 +112,7 @@ $(boot_zip): $(bootclasspath_jars) $(system_server_jars) $(SOONG_ZIP) $(MERGE_ZI 
	$(SOONG_ZIP) -o $@.tmp \

	  -C $(dir $(firstword $(PRIVATE_BOOTCLASSPATH_JARS)))/.. $(addprefix -f ,$(PRIVATE_BOOTCLASSPATH_JARS)) \

	  -C $(PRODUCT_OUT) $(addprefix -f ,$(PRIVATE_SYSTEM_SERVER_JARS)) \

	  -e METADATA.txt -f $(boot_zip_metadata_txt)

	  -j -f $(boot_zip_metadata_txt)

	$(MERGE_ZIPS) $@ $@.tmp $(DEXPREOPT_IMAGE_ZIP_boot) $(DEXPREOPT_IMAGE_ZIP_art) $(DEXPREOPT_IMAGE_ZIP_mainline)

	rm -f $@.tmp