From 3ba942c06581832e77bce59258ff32cd3d7d4114 Mon Sep 17 00:00:00 2001 From: Mahantesh Sanakall Date: Mon, 7 Aug 2017 16:42:06 +0530 Subject: [PATCH] sanders: Use build variables to build device matrices. Move away from building device manifest through PRODUCT_COPY_FILES. Use the build variables - DEVICE_MANIFEST_FILE and DEVICE_MATRIX_FILE to build device manifest and device compatibility files repectively. Change-Id: Ieb3e410118ee9fe00c6b03e32a983e584960d8dc --- BoardConfig.mk | 4 ++++ compatibility_matrix.xml => configs/compatibility_matrix.xml | 0 manifest.xml => configs/manifest.xml | 0 device.mk | 5 ----- 4 files changed, 4 insertions(+), 5 deletions(-) rename compatibility_matrix.xml => configs/compatibility_matrix.xml (100%) rename manifest.xml => configs/manifest.xml (100%) diff --git a/BoardConfig.mk b/BoardConfig.mk index 2ecdec8..5d0f42e 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -167,6 +167,10 @@ TARGET_PROVIDES_KEYMASTER := true # Lights TARGET_PROVIDES_LIBLIGHT := true +# Manifest +DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/configs/manifest.xml +DEVICE_MATRIX_FILE := $(DEVICE_PATH)/configs/compatibility_matrix.xml + # Media # TARGET_USES_MEDIA_EXTENSIONS := true diff --git a/compatibility_matrix.xml b/configs/compatibility_matrix.xml similarity index 100% rename from compatibility_matrix.xml rename to configs/compatibility_matrix.xml diff --git a/manifest.xml b/configs/manifest.xml similarity index 100% rename from manifest.xml rename to configs/manifest.xml diff --git a/device.mk b/device.mk index 7ae3435..c6ea35a 100644 --- a/device.mk +++ b/device.mk @@ -191,11 +191,6 @@ PRODUCT_PACKAGES += \ libloc_api-rpc-qc \ libshims_get_process_name -# HIDL -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/manifest.xml:system/vendor/manifest.xml \ - $(LOCAL_PATH)/compatibility_matrix.xml:system/vendor/compatibility_matrix.xml - # IMS PRODUCT_PACKAGES += \ libshim_ims