From be1029af71df8c8242580e7c7b23cf3cd68bab33 Mon Sep 17 00:00:00 2001 From: Victor Hsieh Date: Fri, 7 Jan 2022 10:42:23 -0800 Subject: [PATCH] Add missing dependencies of fs-verity manifest APK Otheriwse, the build complains about missing files when PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA is enabled (aosp/1937717). Bug: 206326351 Test: clobber, set PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA := true, build Change-Id: I11d18914d63cab0b84ae711f2334747cb26ca234 --- core/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index f33307d39c..aaf2ba4c22 100644 --- a/core/Makefile +++ b/core/Makefile @@ -2789,7 +2789,8 @@ $(FSVERITY_APK_OUT): PRIVATE_INPUTS := $(fsverity-metadata-targets) $(FSVERITY_APK_OUT): $(HOST_OUT_EXECUTABLES)/fsverity_manifest_generator \ $(HOST_OUT_EXECUTABLES)/fsverity $(HOST_OUT_EXECUTABLES)/aapt2 \ $(HOST_OUT_EXECUTABLES)/apksigner $(FSVERITY_APK_MANIFEST_PATH) \ - $(FSVERITY_APK_KEY_PATH).x509.pem $(FSVERITY_APK_KEY_PATH).pk8 + $(FSVERITY_APK_KEY_PATH).x509.pem $(FSVERITY_APK_KEY_PATH).pk8 \ + $(fsverity-metadata-targets) $< --fsverity-path $(PRIVATE_FSVERITY) --aapt2-path $(PRIVATE_AAPT2) \ --apksigner-path $(PRIVATE_APKSIGNER) --apk-key-path $(PRIVATE_KEY) \ --apk-manifest-path $(PRIVATE_MANIFEST) --output $@ \