commit d36d4d8608fe076957f51db3a9a53b33d3c204f5
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 13 01:06:01 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 13 01:06:01 2022 +0000
tree e1e508c01ff66f9d4c3bf9a7b26a2d5164351420
parent 3a0656307c0729b4df2b101d42f8179f960b0c7e
parent fb3ef8a59f10be76b0960a378912cd7c1ec5d6fb

Merge "Generate .fsv_meta for more files"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index d420c29..137ed12 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2760,12 +2760,10 @@
 
 # Generate fsv_meta
 fsverity-metadata-targets := $(sort $(filter \
-  $(TARGET_OUT)/framework/%.jar \
-  $(foreach arch,$(TARGET_ARCH) $(TARGET_2ND_ARCH),$(foreach ext,oat vdex art, \
-    $(TARGET_OUT)/framework/oat/$(arch)/%.$(ext))) \
+  $(TARGET_OUT)/framework/% \
   $(TARGET_OUT)/etc/boot-image.prof \
   $(TARGET_OUT)/etc/dirty-image-objects \
-  $(TARGET_OUT)/etc/updatable-bcp-packages.txt, \
+  $(TARGET_OUT)/etc/classpaths/%.pb, \
   $(ALL_GENERATED_SOURCES) $(ALL_DEFAULT_INSTALLED_MODULES)))
 
 define fsverity-generate-metadata