Copy verified_boot.xml unconditionally.
The BOARD_AVB_ENABLE setting is not available at this stage of the build
unless a vendor file sets it. As
make/target/board/BoardConfigGsiCommon.mk is setting the flag it could
be argued that setting it in vendor files as well could be redundant or contradictory.
For the emulator, copying the permission seems to have no ill effect,
even if we boot without verified boot enabled.
Bug: b/118443541
Test:
- Build image and asserted that xml file is present.
- Started emulator both with and without verified boot enabled
- Ran CtsSecurityTestCases
android.security.cts.VerifiedBootTest#testVerifiedBootSupport and
asserted that it is now passing.
Change-Id: I66b749a6b4712ae5fedd290dfc6d8dc00e5c6c1b
diff --git a/vendor.mk b/vendor.mk
index 722ad2b..08454f1 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -127,10 +127,6 @@
PRODUCT_COPY_FILES += \
device/generic/goldfish/data/etc/permissions/privapp-permissions-goldfish.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-goldfish.xml
-ifeq ($(BOARD_AVB_ENABLE),true)
-PRODUCT_COPY_FILES += \
- frameworks/native/data/etc/android.software.verified_boot.xml:system/etc/permissions/android.software.verified_boot.xml
-endif
PRODUCT_COPY_FILES += \
device/generic/goldfish/data/etc/apns-conf.xml:data/misc/apns/apns-conf.xml \
@@ -161,6 +157,7 @@
frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml \
frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \
frameworks/native/data/etc/android.software.autofill.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.autofill.xml \
+ frameworks/native/data/etc/android.software.verified_boot.xml:system/etc/permissions/android.software.verified_boot.xml \
frameworks/av/media/libeffects/data/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
device/generic/goldfish/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf \
frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
