diff options
| author | Baligh Uddin <baligh@google.com> | 2022-02-16 05:25:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-16 05:25:11 +0000 |
| commit | b03fc107ffaff42f005e166a47171fc071e99f2c (patch) | |
| tree | f361dcbd5c33320000fcdbdf77a4cf4cf97c4ed5 | |
| parent | 678e4226b315cef81a7904f15652dde2e996a49e (diff) | |
| parent | f7340efd88cf26e7f38fb8bab931a7c6783fee35 (diff) | |
| download | Media-b03fc107ffaff42f005e166a47171fc071e99f2c.tar.gz | |
Merge "Prepare to extract apex/media to packages/modules/Media" am: c6bdeea3cf am: e399943499 am: f7340efd88
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1987168
Change-Id: I99c86dcc99d61a059cd4475f0d737ad5d0b5b3f5
| -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 2c2af28..e38488d 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 { @@ -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", ], } diff --git a/apex/service/Android.bp b/apex/service/Android.bp index 834e5cb..0e300bb 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 { |