commit 0ef294390203a2195febb7e4077e808ecf998c0e
author android-build-team Robot <android-build-team-robot@google.com> Tue Jun 16 07:13:28 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jun 16 07:15:52 2020 +0000
tree 53d2afd885dfa35fd5aa1e0bc54e0543ddfb3d75
parent fbbae99c7e861315840a66f83cafa30397f67b2f
parent 776e2b546b7fdd374a2b6effc4c04c7d920a34a0

Make change and version bump to r_aml_300801700 for mainline module file: apex/manifest_codec.json

Change-Id: I87727ca3db119e498a4926854c97785d79903236

apex/manifest.json

diff --git a/apex/manifest.json b/apex/manifest.json
index 8be2649..8a3653d 100644
--- a/apex/manifest.json
+++ b/apex/manifest.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.media",
-  "version": 300801600
+  "version": 300801700
 }

apex/manifest_codec.json

diff --git a/apex/manifest_codec.json b/apex/manifest_codec.json
index b29592c..3a8eed8 100644
--- a/apex/manifest_codec.json
+++ b/apex/manifest_codec.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.media.swcodec",
-  "version": 300801600
+  "version": 300801700
 }

media/libmedia/Android.bp

diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index 4925ea4..3fd3fc3 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -33,10 +33,8 @@
     path: "aidl",
 }
 
-aidl_interface {
-    name: "resourcemanager_aidl_interface",
-    unstable: true,
-    local_include_dir: "aidl",
+filegroup {
+    name: "resourcemanager_aidl",
     srcs: [
         "aidl/android/media/IResourceManagerClient.aidl",
         "aidl/android/media/IResourceManagerService.aidl",
@@ -45,6 +43,16 @@
         "aidl/android/media/MediaResourceParcel.aidl",
         "aidl/android/media/MediaResourcePolicyParcel.aidl",
     ],
+    path: "aidl",
+}
+
+aidl_interface {
+    name: "resourcemanager_aidl_interface",
+    unstable: true,
+    local_include_dir: "aidl",
+    srcs: [
+        ":resourcemanager_aidl",
+    ],
 }
 
 cc_library_shared {