Generate .fsv_meta for more files
For system/framework, it now also includes *.jar.prof (needed by
odrefresh), *.vdex and <arch>/*.{odex,art} (for future-proof).
system/etc/classpaths/*.pb are also added so that we can run
derive_classpath to collect from.
system/etc/updatable-bcp-packages.txt is removed because it's no longer
used by ART.
Bug: 206869687
Test: see new files in `unzip -p $OUT/system/etc/security/fsverity/ \
BuildManifest.apk assets/build_manifest.pb`
Change-Id: Id759f5caec8ba683af8629956b9268a4fbd74186
diff --git a/core/Makefile b/core/Makefile
index aaf2ba4..25bfab9 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2757,12 +2757,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