aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-05-23 09:23:28 -0700
committerTao Bao <tbao@google.com>2018-05-24 10:07:30 -0700
commitba822a97cd099e969dccf9fb7b772845d5390a06 (patch)
tree27b3193a4edc14b5e597060456a4730c95e22d5e
parent76c6cf247e475548bae94216ea8e596e98e19988 (diff)
downloadbuild-ba822a97cd099e969dccf9fb7b772845d5390a06.tar.gz
Pack additional AVB testkeys into otatools.zip.
Bug: 71372646 Test: `m -j otatools-package`; Check $OUT/otatools.zip. Change-Id: I42ad9047d1c5873b7770dc1f92757cd9e5e047ba Merged-In: I42ad9047d1c5873b7770dc1f92757cd9e5e047ba (cherry picked from commit 2d0e5124b07b80213e77685ef1858aba478d4ddd)
-rw-r--r--core/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile
index a6b67addb8..0a2f6e39d0 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2409,7 +2409,8 @@ $(BUILT_OTATOOLS_PACKAGE): zip_root := $(call intermediates-dir-for,PACKAGING,ot
OTATOOLS_DEPS := \
system/extras/verity/build_verity_metadata.py \
system/extras/ext4_utils/mke2fs.conf \
- 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)) \