commit c976f1260aa56ffdd6778754f208bc619c9dbf94
author Pawin Vongmasa <pawin@google.com> Wed Apr 10 02:08:28 2019 -0700
committer Pawin Vongmasa <pawin@google.com> Wed Apr 10 04:43:33 2019 -0700
tree 3889acfcf913357ecb137ef5e26b4d823ed8a4b1
parent 81526c7e3e632e6e183b9c94ce554f701e4cfc6d

Move vintf_fragments for sw C2 to mediaserver

This is a workaround for b/130058564.

Test: adb shell stagefright -i | grep "c2.android"

Bug: 130254909
Change-Id: I8e8f7bbd9c1f777285cdcc58ea6610639122c928

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 6673543..0a9551d 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -99,7 +99,6 @@
     name: "com.android.media.swcodec",
     manifest: "manifest_codec.json",
     defaults: ["com.android.media.swcodec-defaults"],
-    vintf_fragments: ["manifest_media_c2_software.xml"],
 }
 
 apex_key {

media/mediaserver/Android.bp

diff --git a/media/mediaserver/Android.bp b/media/mediaserver/Android.bp
index 6a1cc71..a968890 100644
--- a/media/mediaserver/Android.bp
+++ b/media/mediaserver/Android.bp
@@ -43,4 +43,5 @@
         "-Wall",
     ],
 
+    vintf_fragments: ["manifest_media_c2_software.xml"],
 }

media/mediaserver/manifest_media_c2_software.xml

diff --git a/apex/manifest_media_c2_software.xml b/media/mediaserver/manifest_media_c2_software.xml
similarity index 100%
rename from apex/manifest_media_c2_software.xml
rename to media/mediaserver/manifest_media_c2_software.xml