From d748503541f8b39d956a28035dcce07bde789007 Mon Sep 17 00:00:00 2001
From: Jan Altensen <info@stricted.net>
Date: Mon, 14 Sep 2020 04:50:22 +0200
Subject: [PATCH] j7elte: Copy manifest.xml via DEVICE_MANIFEST_FILE

Change-Id: Iaaa12c03abd0f670f0caa6346b75798460094ad5
---
 BoardConfig.mk | 3 +++
 device.mk      | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 400a716..00c30a0 100644
--- 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 dc2d8b1..ead1dd7 100644
--- 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 \
-- 
2.20.1