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
This commit is contained in:
Bowgo Tsai 2017-06-23 10:50:53 +08:00
parent 96040f39bc
commit 952f6a458e
4 changed files with 0 additions and 5 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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