universal8895: copy manifest.xml via DEVICE_MANIFEST_FILE

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index a1c0abd5abdc96300e235853b7a37589438f43b3..6b6cb5f05bfb1f873773214955dd0f733abeaf55 100644 (file)
--- 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 024433503cdd039e63f056586315421558321c11..66fd2e57d019d88b0aaa949379aad47f950b289d 100644 (file)
--- 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