Revert "Generate fs-verity build manifst APK for other partitions"
Revert submission 2212483-fsverity-manifest-apk-per-partition
Reason for revert: b/246781147
Reverted Changes:
I503672571:Generate fs-verity build manifst APK for other par...
Iebc54ea44:Rename to PRODUCT_FSVERITY_GENERATE_METADATA
Change-Id: I8335b3016a52e474418fb28139c37e35e3468170
diff --git a/core/product.mk b/core/product.mk
index 277fa74..ee2fa5a 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -356,12 +356,15 @@
# This option is only meant to be set by compliance GSI targets.
_product_single_value_vars += PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT
-# If set, fsverity metadata files will be generated for each files in the
-# allowlist, plus an manifest APK per partition. For example,
-# /system/framework/service.jar will come with service.jar.fsv_meta in the same
-# directory; the file information will also be included in
-# /system/etc/security/fsverity/BuildManifest.apk
-_product_single_value_vars += PRODUCT_FSVERITY_GENERATE_METADATA
+# If set, metadata files for the following artifacts will be generated.
+# - system/framework/*.jar
+# - system/framework/oat/<arch>/*.{oat,vdex,art}
+# - system/etc/boot-image.prof
+# - system/etc/dirty-image-objects
+# One fsverity metadata container file per one input file will be generated in
+# system.img, with a suffix ".fsv_meta". e.g. a container file for
+# "/system/framework/foo.jar" will be "system/framework/foo.jar.fsv_meta".
+_product_single_value_vars += PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA
# If true, sets the default for MODULE_BUILD_FROM_SOURCE. This overrides
# BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE but not an explicitly set value.