From a653616f182f203093c7fd0da1d5482cf6c909fc Mon Sep 17 00:00:00 2001
From: Calvin Huang <calhuang@google.com>
Date: Mon, 20 Apr 2020 12:41:20 -0700
Subject: [PATCH] Add manifest to vintf fragments

Bug: 153734354
Test: Manual
Change-Id: I5f29cdacced0bdc0bf5a74f92ecda916f10bea06
---
 automotive/vehicle/2.0/default/Android.bp                      | 3 +++
 .../android.hardware.automotive.vehicle@2.0-service.xml}       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
 rename automotive/vehicle/2.0/{manifest.vehicle.xml => default/android.hardware.automotive.vehicle@2.0-service.xml} (83%)

diff --git a/automotive/vehicle/2.0/default/Android.bp b/automotive/vehicle/2.0/default/Android.bp
index e529675203..21b410a080 100644
--- a/automotive/vehicle/2.0/default/Android.bp
+++ b/automotive/vehicle/2.0/default/Android.bp
@@ -125,6 +125,9 @@ cc_test {
 cc_binary {
     name: "android.hardware.automotive.vehicle@2.0-service",
     defaults: ["vhal_v2_0_defaults"],
+    vintf_fragments: [
+        "android.hardware.automotive.vehicle@2.0-service.xml",
+    ],
     init_rc: ["android.hardware.automotive.vehicle@2.0-service.rc"],
     vendor: true,
     relative_install_path: "hw",
diff --git a/automotive/vehicle/2.0/manifest.vehicle.xml b/automotive/vehicle/2.0/default/android.hardware.automotive.vehicle@2.0-service.xml
similarity index 83%
rename from automotive/vehicle/2.0/manifest.vehicle.xml
rename to automotive/vehicle/2.0/default/android.hardware.automotive.vehicle@2.0-service.xml
index 832b302dfa..660b03d9cf 100644
--- a/automotive/vehicle/2.0/manifest.vehicle.xml
+++ b/automotive/vehicle/2.0/default/android.hardware.automotive.vehicle@2.0-service.xml
@@ -1,4 +1,4 @@
-<manifest version="1.0" type="device" target-level="3">
+<manifest version="1.0" type="device">
     <hal format="hidl">
         <name>android.hardware.automotive.vehicle</name>
         <transport>hwbinder</transport>