diff options
| author | Bob Badour <bbadour@google.com> | 2022-01-26 03:34:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-26 03:34:13 +0000 |
| commit | af88a721b6b1b64a987c4c5f431f525da3f4fdce (patch) | |
| tree | 3dd052e29337e95f85668b6d5ac8136a9bf8c723 | |
| parent | 8216bedf689a28555c27ce610bf9e8bae1bd5ac3 (diff) | |
| parent | 9603f76414c723e5140d2363144ce98307c91356 (diff) | |
| download | av-af88a721b6b1b64a987c4c5f431f525da3f4fdce.tar.gz | |
Fix license texts. am: 9c22d6910e am: f0477be658 am: 9603f76414
Original change: https://android-review.googlesource.com/c/platform/hardware/google/av/+/1959709
Change-Id: I026e66cef530c75c1be05c5b45387a247c4ef88e
| -rw-r--r-- | Android.bp | 14 | ||||
| -rw-r--r-- | media/eco/Android.bp | 6 | ||||
| -rw-r--r-- | media/eco/tests/Android.bp | 6 |
3 files changed, 4 insertions, 22 deletions
@@ -5,16 +5,6 @@ soong_namespace { } package { - default_applicable_licenses: ["hardware_google_av_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "hardware_google_av_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - // large-scale-change unable to identify any license_text files + // See: http://go/android-license-faq + default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/media/eco/Android.bp b/media/eco/Android.bp index 7289f7a..bf699bf 100644 --- a/media/eco/Android.bp +++ b/media/eco/Android.bp @@ -1,10 +1,6 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "hardware_google_av_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["hardware_google_av_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } filegroup { diff --git a/media/eco/tests/Android.bp b/media/eco/tests/Android.bp index 40e14bf..70390cc 100644 --- a/media/eco/tests/Android.bp +++ b/media/eco/tests/Android.bp @@ -1,10 +1,6 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "hardware_google_av_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["hardware_google_av_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } cc_defaults{ |