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

Merge "Unconditionally generate build_manifest.pb"

Browse Source
This commit is contained in:
Treehugger Robot
2022-11-01 23:50:05 +00:00
committed by Gerrit Code Review
parent 1bb27903e8 921d3b0f11
commit 99d607c0ad
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)) $$(fsverity-metadata-targets-$(2))
rm -rf $$(PRIVATE_ASSETS) rm -rf $$(PRIVATE_ASSETS)
mkdir -p $$(PRIVATE_ASSETS) mkdir -p $$(PRIVATE_ASSETS)
ifdef fsverity-metadata-targets-$(2)
$$< --fsverity-path $$(PRIVATE_FSVERITY) \ $$< --fsverity-path $$(PRIVATE_FSVERITY) \
--base-dir $$(PRODUCT_OUT) \ --base-dir $$(PRODUCT_OUT) \
--output $$(PRIVATE_ASSETS)/build_manifest.pb \ --output $$(PRIVATE_ASSETS)/build_manifest.pb \
$$(PRIVATE_INPUTS) $$(PRIVATE_INPUTS)
endif # fsverity-metadata-targets-$(2)
$$(PRIVATE_AAPT2) link -o $$@ \ $$(PRIVATE_AAPT2) link -o $$@ \
-A $$(PRIVATE_ASSETS) \ -A $$(PRIVATE_ASSETS) \
-I $$(PRIVATE_FRAMEWORK_RES) \ -I $$(PRIVATE_FRAMEWORK_RES) \