Merge "Unconditionally generate build_manifest.pb"

2022-11-01 23:50:05 +00:00
parent 1bb27903e8 921d3b0f11
commit 99d607c0ad
1 changed files with 0 additions and 2 deletions
--- a/core/Makefile
+++ b/core/Makefile
@@ -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) \