summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDavid Zeuthen <zeuthen@google.com>2017-06-22 21:26:10 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-06-22 21:26:10 +0200
commitb0c38f1cce39ec8dfd6c28b65ce7091c1a67fda5 (patch)
treed446d84bb287e6997b45e1153b8ca4d327c89a19 /tests
parentMerge "Introduce VR recovery ui" am: 5efe2bca22 (diff)
parentMerge "update_verifier: Support AVB." (diff)
downloadandroid_bootable_recovery-b0c38f1cce39ec8dfd6c28b65ce7091c1a67fda5.tar
android_bootable_recovery-b0c38f1cce39ec8dfd6c28b65ce7091c1a67fda5.tar.gz
android_bootable_recovery-b0c38f1cce39ec8dfd6c28b65ce7091c1a67fda5.tar.bz2
android_bootable_recovery-b0c38f1cce39ec8dfd6c28b65ce7091c1a67fda5.tar.lz
android_bootable_recovery-b0c38f1cce39ec8dfd6c28b65ce7091c1a67fda5.tar.xz
android_bootable_recovery-b0c38f1cce39ec8dfd6c28b65ce7091c1a67fda5.tar.zst
android_bootable_recovery-b0c38f1cce39ec8dfd6c28b65ce7091c1a67fda5.zip
Diffstat (limited to 'tests')
-rw-r--r--tests/Android.mk4
-rw-r--r--tests/component/update_verifier_test.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/Android.mk b/tests/Android.mk
index 262f4ffdd..346873dbe 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -92,6 +92,10 @@ ifeq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),true)
LOCAL_CFLAGS += -DPRODUCT_SUPPORTS_VERITY=1
endif
+ifeq ($(BOARD_AVB_ENABLE),true)
+LOCAL_CFLAGS += -DBOARD_AVB_ENABLE=1
+endif
+
LOCAL_MODULE := recovery_component_test
LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_C_INCLUDES := bootable/recovery
diff --git a/tests/component/update_verifier_test.cpp b/tests/component/update_verifier_test.cpp
index 73b4478aa..5fc7ef63f 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;