Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prepare to extract apex/media to packages/modules/Media" am: c6bdeea3cf am: 5d27eda956 am: 1797a76242

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

Change-Id: I99c86dcc99d61a059cd4475f0d737ad5d0b5b3f5
This commit is contained in:
Baligh Uddin
2022-02-16 05:25:11 +00:00
committed by Automerger Merge Worker
parent 6f0012af39 1797a76242
commit 8f618574a0
4 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apex/media/Android.bp
View File

@@ -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
// 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"],
default_applicable_licenses: ["Android-Apache-2.0"],
}
sdk {

6
apex/media/aidl/Android.bp
View File

@@ -16,11 +16,7 @@
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// 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"],
default_applicable_licenses: ["Android-Apache-2.0"],
}
filegroup {

7
apex/media/framework/Android.bp
View File

@@ -14,11 +14,7 @@
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// 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"],
default_applicable_licenses: ["Android-Apache-2.0"],
}
java_library {
@@ -68,6 +64,7 @@ java_library {
"//frameworks/av/apex:__subpackages__",
"//frameworks/base/apex/media/service",
"//frameworks/base/api", // For framework-all
"//packages/modules/Media/apex/service",
],
}

6
apex/media/service/Android.bp
View File

@@ -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
// 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"],
default_applicable_licenses: ["Android-Apache-2.0"],
}
filegroup {