From 952f6a458e63b58117e0a1cfae06b452a7394c6b Mon Sep 17 00:00:00 2001 From: Bowgo Tsai Date: Fri, 23 Jun 2017 10:50:53 +0800 Subject: [PATCH] Removing vboot 1.0 verity metadata The generic system.img shouldn't contain any specific verity metadata because we don't mandate how to do verified boot. Plus, OC-DR devices use AVB instead of vboot 1.0. Bug: 62647718 Test: Boot a DR device with the generic system.img Change-Id: I0966d88d4512621cce7b8abdc28a90a6e312a391 --- target/product/aosp_arm64_a.mk | 1 - target/product/aosp_arm64_ab.mk | 1 - target/product/aosp_arm_a.mk | 1 - target/product/treble_common.mk | 2 -- 4 files changed, 5 deletions(-) diff --git a/target/product/aosp_arm64_a.mk b/target/product/aosp_arm64_a.mk index 535b3a47c..4258f04f7 100644 --- a/target/product/aosp_arm64_a.mk +++ b/target/product/aosp_arm64_a.mk @@ -23,7 +23,6 @@ include build/make/target/product/treble_common.mk $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/verity.mk) PRODUCT_NAME := aosp_arm64_a PRODUCT_DEVICE := generic_arm64_a diff --git a/target/product/aosp_arm64_ab.mk b/target/product/aosp_arm64_ab.mk index fe3afb7b1..ae50c4216 100644 --- a/target/product/aosp_arm64_ab.mk +++ b/target/product/aosp_arm64_ab.mk @@ -29,7 +29,6 @@ PRODUCT_PACKAGES += \ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/verity.mk) PRODUCT_NAME := aosp_arm64_ab PRODUCT_DEVICE := generic_arm64_ab diff --git a/target/product/aosp_arm_a.mk b/target/product/aosp_arm_a.mk index c3188e02c..6be8e82a4 100644 --- a/target/product/aosp_arm_a.mk +++ b/target/product/aosp_arm_a.mk @@ -22,7 +22,6 @@ include build/make/target/product/treble_common.mk $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/verity.mk) PRODUCT_NAME := aosp_arm_a PRODUCT_DEVICE := generic_arm_a diff --git a/target/product/treble_common.mk b/target/product/treble_common.mk index ebedb3fa8..5fd5f2171 100644 --- a/target/product/treble_common.mk +++ b/target/product/treble_common.mk @@ -187,8 +187,6 @@ PRODUCT_PACKAGES += \ libsync \ libvulkan \ -PRODUCT_SYSTEM_VERITY_PARTITION := /dev/block/bootdevice/by-name/system - # Audio: USE_XML_AUDIO_POLICY_CONF := 1 # The following policy XML files are used as fallback for