Merge "Fix pvmfw.img signing error" into main
diff --git a/core/Makefile b/core/Makefile
index 92f9b9c..80eaf2c 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1797,6 +1797,7 @@
INTERNAL_VENDOR_KERNEL_RAMDISK_TARGET := $(call intermediates-dir-for,PACKAGING,vendor_kernel_boot)/vendor_kernel_ramdisk.cpio$(RAMDISK_EXT)
$(INTERNAL_VENDOR_KERNEL_RAMDISK_TARGET): $(MKBOOTFS) $(INTERNAL_VENDOR_KERNEL_RAMDISK_FILES) | $(COMPRESSION_COMMAND_DEPS)
+ $(hide) : $(words $(INTERNAL_VENDOR_KERNEL_RAMDISK_FILES))
$(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_VENDOR_KERNEL_RAMDISK_OUT) | $(COMPRESSION_COMMAND) > $@
INSTALLED_VENDOR_KERNEL_RAMDISK_TARGET := $(PRODUCT_OUT)/vendor_kernel_ramdisk.img
diff --git a/tools/releasetools/fsverity_metadata_generator.py b/tools/releasetools/fsverity_metadata_generator.py
index 50e23e7..e531cca 100644
--- a/tools/releasetools/fsverity_metadata_generator.py
+++ b/tools/releasetools/fsverity_metadata_generator.py
@@ -230,12 +230,6 @@
if not output_file:
output_file = input_file + '.fsv_meta'
- if output_file != args.input + '.fsv_meta':
- sys.exit('When generating .fsv_meta files for symlinks, we assume that all fsv_meta files '
- 'are named the same as the file they protect, just with the .fsv_meta suffix appended. '
- 'We require that all .fsv_meta files follow this convention regardless of if it\'s a link or '
- 'not. However {args.input} had a different output file: {args.output}')
-
# remove the output file first, as switching between a file and a symlink can be complicated
try:
os.remove(output_file)