j7elte: Copy manifest.xml via DEVICE_MANIFEST_FILE

Change-Id: Iaaa12c03abd0f670f0caa6346b75798460094ad5

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 400a716a7699887f9b5de115a15423662f23c3dd..00c30a0df969ee128fbac53833ca169d6604ee66 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -47,6 +47,9 @@ BOARD_MODEM_TYPE := tss310
 BOARD_PROVIDES_LIBRIL := true
 BOARD_NEEDS_ROAMING_PROTOCOL_FIELD := true
 
+# Manifest
+DEVICE_MANIFEST_FILE := $(LOCAL_PATH)/manifest.xml
+
 # Shim
 TARGET_LD_SHIM_LIBS += \
     /system/lib/libcamera_client.so|/vendor/lib/libcamera_client_shim.so \

diff --git a/device.mk b/device.mk
index dc2d8b15c9ef0fdf5b7a6df9ddde67b0b405d9ab..ead1dd78d72cc6c0fca13d59f8a9fbb894e19292 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -46,10 +46,6 @@ PRODUCT_AAPT_CONFIG := normal
 PRODUCT_AAPT_PREF_CONFIG := xhdpi
 PRODUCT_AAPT_PREBUILT_DPI := hdpi mdpi
 
-# HIDL Manifest
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml
-
 # Keylayouts
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/keylayout/gpio_keys.kl:system/usr/keylayout/gpio_keys.kl \