commit 05839181a7ffe49e8039bd9e3b794d50281022f9
author Lajos Molnar <lajos@google.com> Wed Apr 10 16:23:25 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 10 16:23:25 2019 +0000
tree 8ce967b22a8cd5fcfd29c37c549f4c5cc5bdea06
parent 52a304959ece76f2b0066b8091272b11fc4bbbbd
parent c976f1260aa56ffdd6778754f208bc619c9dbf94

Merge "Move vintf_fragments for sw C2 to mediaserver" into qt-dev

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