diff options
| author | Baligh Uddin <baligh@google.com> | 2022-02-16 04:44:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-16 04:44:30 +0000 |
| commit | e3999434990781a2b4236f370efcb7534a891471 (patch) | |
| tree | 386f3f9e6491139cf195f27e00dc932fbafe9966 | |
| parent | 266897d530f5604108ad9f95898f9ef187227081 (diff) | |
| parent | c32f9f24f8a965046a5c2549ade787448df8cdc6 (diff) | |
| download | Media-e3999434990781a2b4236f370efcb7534a891471.tar.gz | |
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
| -rw-r--r-- | apex/Android.bp | 6 | ||||
| -rw-r--r-- | apex/aidl/Android.bp | 6 | ||||
| -rw-r--r-- | apex/framework/Android.bp | 7 | ||||
| -rw-r--r-- | apex/service/Android.bp | 6 |
4 files changed, 5 insertions, 20 deletions
diff --git a/apex/Android.bp b/apex/Android.bp index 1a710a9..96e88dd 100644 --- a/apex/Android.bp +++ b/apex/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 - // 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 { diff --git a/apex/aidl/Android.bp b/apex/aidl/Android.bp index 545a0cd..4ba0d9b 100644 --- a/apex/aidl/Android.bp +++ b/apex/aidl/Android.bp @@ -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 { diff --git a/apex/framework/Android.bp b/apex/framework/Android.bp index 6195f25..a5e6df1 100644 --- a/apex/framework/Android.bp +++ b/apex/framework/Android.bp @@ -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 { @@ -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", ], } diff --git a/apex/service/Android.bp b/apex/service/Android.bp index 271fc53..1911735 100644 --- a/apex/service/Android.bp +++ b/apex/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 - // 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 { |