Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 952f6a45 authored by Bowgo Tsai's avatar Bowgo Tsai
Browse files

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
parent 96040f39

target/product/aosp_arm64_a.mk

+0 −1
Original line number Diff line number Diff line
@@ -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

target/product/aosp_arm64_ab.mk

+0 −1
Original line number Diff line number Diff line
@@ -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

target/product/aosp_arm_a.mk

+0 −1
Original line number Diff line number Diff line
@@ -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

target/product/treble_common.mk

+0 −2
Original line number Diff line number Diff line
@@ -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