summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYury Khmel <khmel@google.com>2020-05-20 12:26:38 -0700
committerCommit Bot <commit-bot@chromium.org>2020-05-27 04:41:39 +0000
commit0ba818558937609e1c13a96a32369aba261828d3 (patch)
tree07213931df9728c2e47ea7d0249fde231624fa5a
parent26e9494948c31190344b67c6a20e7f4444c1403d (diff)
downloadvboot-0ba818558937609e1c13a96a32369aba261828d3.tar.gz
image_signing: Activate file hash cache for watchlist service for signed builds.
This follows the logic introduced in crrev.com/i/2523754 BUG=b:148229706 TEST= ./sign_official_build.sh usb source_image \ ~/trunk/src/platform/vboot_reference/tests/devkeys out_image BRANCH=None Cq-Depend: chrome-internal:3022044 Signed-off-by: Yury Khmel <khmel@google.com> Change-Id: I5398a9ea2984f0be11cb512f845507309d5f8f8e Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2210771 Reviewed-by: Mike Frysinger <vapier@chromium.org>
-rwxr-xr-xscripts/image_signing/sign_android_image.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/image_signing/sign_android_image.sh b/scripts/image_signing/sign_android_image.sh
index 22347317..f48a5f0a 100755
--- a/scripts/image_signing/sign_android_image.sh
+++ b/scripts/image_signing/sign_android_image.sh
@@ -268,6 +268,7 @@ main() {
# Packages cache needs to be regenerated when the key and timestamp are
# changed for apks.
local packages_cache="${system_mnt}/system/etc/packages_cache.xml"
+ local file_hash_cache="${system_mnt}/system/etc/file_hash_cache"
if [[ -f "${packages_cache}" ]]; then
if type -P aapt &>/dev/null; then
info "Regenerating packages cache ${packages_cache}"
@@ -283,10 +284,12 @@ main() {
sudo "${unsquashfs}" -x -f -no-progress -d "${vendor_mnt}/vendor" \
"${vendor_img}"
if ! arc_generate_packages_cache "${system_mnt}" "${vendor_mnt}" \
- "${working_dir}/packages_cache.xml"; then
+ "${working_dir}/packages_cache.xml" \
+ "${working_dir}/file_hash_cache"; then
die "Failed to generate packages cache."
fi
sudo cp "${working_dir}/packages_cache.xml" "${packages_cache}"
+ sudo cp "${working_dir}/file_hash_cache" "${file_hash_cache}"
# Set android-root as an owner.
sudo chown 655360:655360 "${packages_cache}"
local packages_after=$(grep "<package " "${packages_cache}" | wc -l)