From 5e3b7679084322e027a7e5121ff0f4944b3b6de6 Mon Sep 17 00:00:00 2001
From: Pawin Vongmasa <pawin@google.com>
Date: Wed, 12 Feb 2020 03:11:06 -0800
Subject: [PATCH] Codec2: Add vintf_fragments to sample service

Test: Builds

Bug: 149371323
Change-Id: Ibea0b1f6cf54c7aca6c33e33134b9c658b0ecd59
---
 media/codec2/hidl/services/Android.bp                 |  5 +++++
 .../hidl/services/manifest_media_c2_V1_0_default.xml  | 11 +++++++++++
 .../hidl/services/manifest_media_c2_V1_1_default.xml  | 11 +++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 media/codec2/hidl/services/manifest_media_c2_V1_0_default.xml
 create mode 100644 media/codec2/hidl/services/manifest_media_c2_V1_1_default.xml

diff --git a/media/codec2/hidl/services/Android.bp b/media/codec2/hidl/services/Android.bp
index 46bea2e583..a16b106d79 100644
--- a/media/codec2/hidl/services/Android.bp
+++ b/media/codec2/hidl/services/Android.bp
@@ -47,6 +47,11 @@ cc_binary {
         "libbinder",
     ],
     required: ["android.hardware.media.c2@1.1-default-seccomp_policy"],
+
+    // The content in manifest_media_c2_V1_1_default.xml can be included
+    // directly in the main device manifest.xml file or via vintf_fragments.
+    // (Remove the line below if the entry is already in the main manifest.)
+    vintf_fragments: ["manifest_media_c2_V1_1_default.xml"],
 }
 
 // seccomp policy file.
diff --git a/media/codec2/hidl/services/manifest_media_c2_V1_0_default.xml b/media/codec2/hidl/services/manifest_media_c2_V1_0_default.xml
new file mode 100644
index 0000000000..e97c3cea03
--- /dev/null
+++ b/media/codec2/hidl/services/manifest_media_c2_V1_0_default.xml
@@ -0,0 +1,11 @@
+<manifest version="1.0" type="device">
+    <hal>
+        <name>android.hardware.media.c2</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IComponentStore</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>
diff --git a/media/codec2/hidl/services/manifest_media_c2_V1_1_default.xml b/media/codec2/hidl/services/manifest_media_c2_V1_1_default.xml
new file mode 100644
index 0000000000..bf0d72f267
--- /dev/null
+++ b/media/codec2/hidl/services/manifest_media_c2_V1_1_default.xml
@@ -0,0 +1,11 @@
+<manifest version="1.0" type="device">
+    <hal>
+        <name>android.hardware.media.c2</name>
+        <transport>hwbinder</transport>
+        <version>1.1</version>
+        <interface>
+            <name>IComponentStore</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>