From 1cc03519155fc333b7db6c90c4d82f70c246997a Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Wed, 18 Apr 2018 17:10:49 -0700 Subject: Make update_verifier generic across verified boot versions. This allows the update_verifier in a general system image to work across devices that have different verified boot versions (i.e. not supported / verified boot 1.0 / verified boot 2.0 / disabled). Bug: 78283982 Test: Run recovery_component_test on both of marlin and walleye. Test: Generate an OTA that has this CL. Install this OTA and check the update_verifier log during the post-reboot verification, on both of marlin (VB 1.0) and walleye (VB 2.0). Test: Build and flash walleye image with verified boot disabled. Check that update_verifier marks the slot as successfully booted. Change-Id: I828d87d59f911786531f774ffcf9b2ad7c2ca007 --- update_verifier/Android.mk | 8 -------- 1 file changed, 8 deletions(-) (limited to 'update_verifier/Android.mk') diff --git a/update_verifier/Android.mk b/update_verifier/Android.mk index 0ff88546f..8d61cd101 100644 --- a/update_verifier/Android.mk +++ b/update_verifier/Android.mk @@ -39,14 +39,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/include -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 - include $(BUILD_STATIC_LIBRARY) # update_verifier (executable) -- cgit v1.2.3