commit bc15d75e5c915188305b2d7b581033809afb585e
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 13 02:56:01 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 13 02:56:01 2018 +0000
tree 9b06d29f23b178d85a3621bbaa83a414eecc7d79
parent c26dea96a21081cb81b93e2ff33a6fcd7a7ca225
parent 17d4bcb83a536ae06c18bd0cf2355b3c9e0f8906

Merge "move device_manifest.xml to base_vendor.mk"

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 83c53b6..8b3f857 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -245,9 +245,8 @@
     wifi-service \
     wm \
 
-# VINTF data
+# VINTF data for system image
 PRODUCT_PACKAGES += \
-    device_manifest.xml \
     framework_manifest.xml \
     framework_compatibility_matrix.xml \
 

target/product/base_vendor.mk

diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk
index 681def2..9542a0e 100644
--- a/target/product/base_vendor.mk
+++ b/target/product/base_vendor.mk
@@ -27,7 +27,6 @@
     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 @@
     shell_and_utilities_vendor \
     vndservice \
     vndservicemanager \
+
+# VINTF data for vendor image
+PRODUCT_PACKAGES += \
+    device_manifest.xml \
+    device_compatibility_matrix.xml \