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

Commit 45263b01 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Unconditionally generate build_manifest.pb" am: 99d607c0 

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



Change-Id: Ib9eace3def0f3827fa1f5829a3347af099179a26
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ec2ee88c 99d607c0

core/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -2987,12 +2987,10 @@ $(1): $(HOST_OUT_EXECUTABLES)/fsverity_manifest_generator \ 
    $$(fsverity-metadata-targets-$(2))

	rm -rf $$(PRIVATE_ASSETS)

	mkdir -p $$(PRIVATE_ASSETS)

ifdef fsverity-metadata-targets-$(2)

	$$< --fsverity-path $$(PRIVATE_FSVERITY) \

	    --base-dir $$(PRODUCT_OUT) \

	    --output $$(PRIVATE_ASSETS)/build_manifest.pb \

	    $$(PRIVATE_INPUTS)

endif  # fsverity-metadata-targets-$(2)

	$$(PRIVATE_AAPT2) link -o $$@ \

	    -A $$(PRIVATE_ASSETS) \

	    -I $$(PRIVATE_FRAMEWORK_RES) \