commit 8b55abd98f32c43ef37a336993829baf6808ff4a
author Yifan Hong <elsk@google.com> Thu Jul 12 21:14:41 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jul 12 21:14:41 2018 -0700
tree 0925f40cd0d5985e7f5402a00f27da8328149067
parent 40e1bb6df98daec0eddf4583c27f7653113bf274
parent bc15d75e5c915188305b2d7b581033809afb585e

Merge "move device_manifest.xml to base_vendor.mk"
am: bc15d75e5c

Change-Id: I9d6a6164cc19f6d1059373907010ace556784a8c

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index b40f7fc..fa73d28 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -250,9 +250,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 d1b0137..27f5441 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.1-service \
     android.hardware.media.omx@1.0-service \
-    device_compatibility_matrix.xml \
     fs_config_files_nonsystem \
     fs_config_dirs_nonsystem \
     gralloc.default \
@@ -49,3 +48,8 @@
     shell_and_utilities_vendor \
     vndservice \
     vndservicemanager \
+
+# VINTF data for vendor image
+PRODUCT_PACKAGES += \
+    device_manifest.xml \
+    device_compatibility_matrix.xml \