StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ib9eace3def0f3827fa1f5829a3347af099179a26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-11-02 00:03:57 +00:00
committed by Automerger Merge Worker
parent ec2ee88c50 99d607c0ad
commit 45263b0159
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/Makefile
View File

@@ -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) \