diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-01-27 02:08:23 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-01-27 02:08:23 +0000 |
| commit | 0abd55f3c22d570e8a23e0b554bda861edb9d4f8 (patch) | |
| tree | 24ce725e4e7d3d9cccf2df15100cb13f9ca012dd | |
| parent | a29bb55d92fd34925be7a405c4a92b6205343d92 (diff) | |
| parent | 0f9c837dc8ce29e4f9ce2e3263cd66ca0d69fb5a (diff) | |
| download | av-0abd55f3c22d570e8a23e0b554bda861edb9d4f8.tar.gz | |
Snap for 8120673 from 0f9c837dc8ce29e4f9ce2e3263cd66ca0d69fb5a to tm-release
Change-Id: I0403b9e2e93fe0e2984344de8faae811f18f6853
| -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 a95d588..18bc547 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{ |