From 322745e2bc580faf84ae98555f0509e152107c06 Mon Sep 17 00:00:00 2001 From: Jan Altensen Date: Tue, 22 Sep 2020 21:31:37 +0400 Subject: [PATCH] universal8895: copy manifest.xml via DEVICE_MANIFEST_FILE --- BoardConfigCommon.mk | 3 +++ device-common.mk | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index a1c0abd..6b6cb5f 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -91,6 +91,9 @@ BOARD_USERDATAIMAGE_PARTITION_SIZE := 58556678144 #(57184256 sda24) BOARD_CACHEIMAGE_PARTITION_SIZE := 524288000 #(512000 sda18) BOARD_FLASH_BLOCK_SIZE := 4096 +# Manifest +DEVICE_MANIFEST_FILE := $(LOCAL_PATH)/manifest.xml + # Exclude AudioFX TARGET_EXCLUDES_AUDIOFX := true diff --git a/device-common.mk b/device-common.mk index 0244335..66fd2e5 100644 --- a/device-common.mk +++ b/device-common.mk @@ -122,10 +122,6 @@ PRODUCT_PACKAGES += \ android.hardware.health@2.0-impl \ android.hardware.health@2.0-service -# HIDL Manifest -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml - # HotwordEnrollement app permissions PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/privapp-permissions-hotword.xml:system/etc/permissions/privapp-permissions-hotword.xml -- 2.20.1