From 17d4bcb83a536ae06c18bd0cf2355b3c9e0f8906 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Tue, 10 Jul 2018 16:43:19 -0700 Subject: [PATCH] move device_manifest.xml to base_vendor.mk Test: make Change-Id: I500269591065569f3102d025b222517dfd4e2c84 --- target/product/base_system.mk | 3 +-- target/product/base_vendor.mk | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 83c53b6e2..8b3f857fd 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -245,9 +245,8 @@ PRODUCT_PACKAGES += \ wifi-service \ wm \ -# VINTF data +# VINTF data for system image PRODUCT_PACKAGES += \ - device_manifest.xml \ framework_manifest.xml \ framework_compatibility_matrix.xml \ diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk index 681def22d..9542a0e23 100644 --- a/target/product/base_vendor.mk +++ b/target/product/base_vendor.mk @@ -27,7 +27,6 @@ PRODUCT_PACKAGES += \ android.hardware.cas@1.0-service \ android.hardware.configstore@1.0-service \ android.hardware.media.omx@1.0-service \ - device_compatibility_matrix.xml \ fs_config_files_nonsystem \ fs_config_dirs_nonsystem \ gralloc.default \ @@ -48,3 +47,8 @@ PRODUCT_PACKAGES += \ shell_and_utilities_vendor \ vndservice \ vndservicemanager \ + +# VINTF data for vendor image +PRODUCT_PACKAGES += \ + device_manifest.xml \ + device_compatibility_matrix.xml \