Merge "Pack additional AVB testkeys into otatools.zip."
diff --git a/core/Makefile b/core/Makefile
index 882dc9f..ddbc847 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2456,9 +2456,8 @@
OTATOOLS_DEPS := \
system/extras/ext4_utils/mke2fs.conf \
- external/avb/test/data/atx_metadata.bin \
- external/avb/test/data/testkey_atx_psk.pem \
- external/avb/test/data/testkey_rsa4096.pem \
+ $(sort $(shell find external/avb/test/data -type f -name "testkey_*.pem" -o \
+ -name "atx_metadata.bin")) \
$(sort $(shell find system/update_engine/scripts -name "*.pyc" -prune -o -type f -print)) \
$(sort $(shell find build/target/product/security -type f -name "*.x509.pem" -o -name "*.pk8" -o \
-name verity_key)) \