diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-07-13 02:56:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-07-13 02:56:01 +0000 |
| commit | bc15d75e5c915188305b2d7b581033809afb585e (patch) | |
| tree | 9b06d29f23b178d85a3621bbaa83a414eecc7d79 | |
| parent | c26dea96a21081cb81b93e2ff33a6fcd7a7ca225 (diff) | |
| parent | 17d4bcb83a536ae06c18bd0cf2355b3c9e0f8906 (diff) | |
| download | build-bc15d75e5c915188305b2d7b581033809afb585e.tar.gz | |
Merge "move device_manifest.xml to base_vendor.mk"android-p-preview-5
| -rw-r--r-- | target/product/base_system.mk | 3 | ||||
| -rw-r--r-- | 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 83c53b6e27..8b3f857fd4 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 681def22dd..9542a0e230 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 \ |