Merge "Generate .fsv_meta for more files" am: d36d4d8608 am: 0f84df6a5e

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

Change-Id: I233936f781d48f775eca1208ce50f27aeacb2ac6
This commit is contained in:
Treehugger Robot
2022-01-13 01:39:17 +00:00
committed by Automerger Merge Worker

View File

@@ -2760,12 +2760,10 @@ ifeq ($(PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA),true)
# Generate fsv_meta # Generate fsv_meta
fsverity-metadata-targets := $(sort $(filter \ fsverity-metadata-targets := $(sort $(filter \
$(TARGET_OUT)/framework/%.jar \ $(TARGET_OUT)/framework/% \
$(foreach arch,$(TARGET_ARCH) $(TARGET_2ND_ARCH),$(foreach ext,oat vdex art, \
$(TARGET_OUT)/framework/oat/$(arch)/%.$(ext))) \
$(TARGET_OUT)/etc/boot-image.prof \ $(TARGET_OUT)/etc/boot-image.prof \
$(TARGET_OUT)/etc/dirty-image-objects \ $(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))) $(ALL_GENERATED_SOURCES) $(ALL_DEFAULT_INSTALLED_MODULES)))
define fsverity-generate-metadata define fsverity-generate-metadata