Merge "Prepare to extract apex/media to packages/modules/Media" am: c6bdeea3cf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1987168

Change-Id: I1b902c5c2cae17ad2002e0275026746a4c84a737

apex/media/Android.bp

@@ -18,11 +18,7 @@ package {
         "//frameworks/av/apex/testing",
     ],
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
+    default_applicable_licenses: ["Android-Apache-2.0"],
-    // all of the 'license_kinds' from "frameworks_base_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["frameworks_base_license"],
 }
 
 sdk {

apex/media/aidl/Android.bp

@@ -16,11 +16,7 @@
 
 package {
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
+    default_applicable_licenses: ["Android-Apache-2.0"],
-    // all of the 'license_kinds' from "frameworks_base_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["frameworks_base_license"],
 }
 
 filegroup {

apex/media/framework/Android.bp

@@ -14,11 +14,7 @@
 
 package {
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
+    default_applicable_licenses: ["Android-Apache-2.0"],
-    // all of the 'license_kinds' from "frameworks_base_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["frameworks_base_license"],
 }
 
 java_library {
@@ -65,6 +61,7 @@ java_library {
         "//frameworks/av/apex:__subpackages__",
         "//frameworks/base/apex/media/service",
         "//frameworks/base/api", // For framework-all
+        "//packages/modules/Media/apex/service",
     ],
 }
 

apex/media/service/Android.bp

@@ -13,11 +13,7 @@
 // limitations under the License.
 package {
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
+    default_applicable_licenses: ["Android-Apache-2.0"],
-    // all of the 'license_kinds' from "frameworks_base_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["frameworks_base_license"],
 }
 
 filegroup {