commit 17555f11571e1da4884a50301f6bdd2cc21876e8
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 07 23:35:25 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 07 23:35:25 2022 +0000
tree aa5d8ba424987fe1916327cb7b86c7f5d88b14eb
parent fd7751d5c62f2a870fd9d71c1c369ff5f5868148
parent a96408cb32926979f4ba170950191837eca5a6fc

Merge "Add missing dependencies of fs-verity manifest APK" am: d541c6c898 am: c10c51039e am: 51d95fc646 am: a96408cb32

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

Change-Id: Ic75c69859fef81740642f854400456810d34f343

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 9d6df20..2841253 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2789,7 +2789,8 @@
 $(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 $@ \