diff options
| author | 2022-02-16 05:16:37 +0000 | |
|---|---|---|
| committer | 2022-02-16 05:16:37 +0000 | |
| commit | 1797a7624273b02a93145decb6864611e7d43bcf (patch) | |
| tree | e1ac64261b100116d70d269726c8149a84f87fcd | |
| parent | 1bb2f2854813abfe4078deac7b7739ad0a7dd98f (diff) | |
| parent | 5d27eda956f52e2d6c68815c8ece67909d84337e (diff) | |
Merge "Prepare to extract apex/media to packages/modules/Media" am: c6bdeea3cf am: 5d27eda956
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1987168
Change-Id: Ide35841d9a14fbd1726a19c12c50067bb9d4c4cf
| -rw-r--r-- | apex/media/Android.bp | 6 | ||||
| -rw-r--r-- | apex/media/aidl/Android.bp | 6 | ||||
| -rw-r--r-- | apex/media/framework/Android.bp | 7 | ||||
| -rw-r--r-- | apex/media/service/Android.bp | 6 |
4 files changed, 5 insertions, 20 deletions
diff --git a/apex/media/Android.bp b/apex/media/Android.bp index 1a710a98b0a9..96e88dd236db 100644 --- a/apex/media/Android.bp +++ b/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 - // 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/media/aidl/Android.bp b/apex/media/aidl/Android.bp index 545a0cd884dc..4ba0d9b03b28 100644 --- a/apex/media/aidl/Android.bp +++ b/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 - // 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/media/framework/Android.bp b/apex/media/framework/Android.bp index 6195f257ecd9..a5e6df1ffb8f 100644 --- a/apex/media/framework/Android.bp +++ b/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 - // 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/media/service/Android.bp b/apex/media/service/Android.bp index 271fc5312f8f..19117357982a 100644 --- a/apex/media/service/Android.bp +++ b/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 - // 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 { |