aboutsummaryrefslogtreecommitdiffstats
path: root/tests/component/update_verifier_test.cpp
diff options
context:
space:
mode:
authorDavid Zeuthen <zeuthen@google.com>2017-05-08 13:41:28 -0400
committerDavid Zeuthen <zeuthen@google.com>2017-05-24 14:14:11 -0400
commit8ed9738b62b075205a81489b01ec882520da183a (patch)
tree6944d37189d4e8d6bf1515d9d93742113ec99997 /tests/component/update_verifier_test.cpp
parent1f9808bd4856122924c9453d871d34fd777d5389 (diff)
downloadandroid_bootable_recovery-8ed9738b62b075205a81489b01ec882520da183a.tar.gz
android_bootable_recovery-8ed9738b62b075205a81489b01ec882520da183a.tar.bz2
android_bootable_recovery-8ed9738b62b075205a81489b01ec882520da183a.zip
update_verifier: Support AVB.
When using AVB, PRODUCT_SUPPORTS_VERITY is not set so check for BOARD_ENABLE_AVB as well. Also AVB sets up the root filesystem as 'vroot' so map that to 'system' since this is what is expected. Managed to test at least that the code is at least compiled in: $ fastboot --set-active=_a Setting current slot to 'a'... OKAY [ 0.023s] finished. total time: 0.023s $ fastboot reboot rebooting... finished. total time: 0.050s $ adb wait-for-device $ adb logcat |grep update_verifier 03-04 05:28:56.773 630 630 I /system/bin/update_verifier: Started with arg 1: nonencrypted 03-04 05:28:56.776 630 630 I /system/bin/update_verifier: Booting slot 0: isSlotMarkedSuccessful=0 03-04 05:28:56.776 630 630 W /system/bin/update_verifier: Failed to open /data/ota_package/care_map.txt: No such file or directory 03-04 05:28:56.788 630 630 I /system/bin/update_verifier: Marked slot 0 as booted successfully. 03-04 05:28:56.788 630 630 I /system/bin/update_verifier: Leaving update_verifier. Bug: None Test: Manually tested on device using AVB bootloader. Change-Id: I13c0fe1cc5d0f397e36f5e62fcc05c8dfee5fd85
Diffstat (limited to 'tests/component/update_verifier_test.cpp')
-rw-r--r--tests/component/update_verifier_test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/component/update_verifier_test.cpp b/tests/component/update_verifier_test.cpp
index 73b4478a..5fc7ef63 100644
--- a/tests/component/update_verifier_test.cpp
+++ b/tests/component/update_verifier_test.cpp
@@ -24,7 +24,7 @@
class UpdateVerifierTest : public ::testing::Test {
protected:
void SetUp() override {
-#ifdef PRODUCT_SUPPORTS_VERITY
+#if defined(PRODUCT_SUPPORTS_VERITY) || defined(BOARD_AVB_ENABLE)
verity_supported = true;
#else
verity_supported = false;