diff options
author | Bob Badour <bbadour@google.com> | 2021-06-23 15:57:01 -0700 |
---|---|---|
committer | Bob Badour <bbadour@google.com> | 2021-09-03 16:23:20 -0700 |
commit | 4bc189377da5f3cb27fb439d677cb89f3390a7a6 (patch) | |
tree | 62bff0a7d543b7d717c6960dd4b1b3f8e38e4236 | |
parent | 3f57341415be5afc47b7311d930da7475bf9fd8b (diff) | |
download | platform_packages_apps_DocumentsUI-android-s-beta-5.tar.gz platform_packages_apps_DocumentsUI-android-s-beta-5.tar.bz2 platform_packages_apps_DocumentsUI-android-s-beta-5.zip |
Fix license text -- switch to Android-Apache-2.0android-s-beta-5android-s-beta-5
Remove Apache 2.0 from license that also included a Public Domain
license to pick up the global license text. Make explicit that the
remaining Public Domain license requires no license_text.
Test: m nothing
Bug: 151177513
Change-Id: Ic9da28b65630b83c3bf4f3441fc54d9364b845e9
Merged-in: Ic9da28b65630b83c3bf4f3441fc54d9364b845e9
-rw-r--r-- | Android.bp | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/Android.bp b/Android.bp index de0247921..fde741ac3 100644 --- a/Android.bp +++ b/Android.bp @@ -13,31 +13,18 @@ // limitations under the License. package { - default_applicable_licenses: ["packages_apps_DocumentsUI_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } -// Added automatically by a large-scale-change that took the approach of -// 'apply every license found to every target'. While this makes sure we respect -// every license restriction, it may not be entirely correct. -// -// e.g. GPL in an MIT project might only apply to the contrib/ directory. -// -// Please consider splitting the single license below into multiple licenses, -// taking care not to lose any license_kind information, and overriding the -// default license using the 'licenses: [...]' property on targets as needed. -// -// For unused files, consider creating a 'fileGroup' with "//visibility:private" -// to attach the license to, and including a comment whether the files may be -// used in the current project. // See: http://go/android-license-faq license { - name: "packages_apps_DocumentsUI_license", - visibility: [":__subpackages__"], + // res/drawable contains at least 1 Public Domain file + name: "packages_apps_DocumentsUI_res_drawable_pd_license", + visibility: ["//visibility:private"], license_kinds: [ - "SPDX-license-identifier-Apache-2.0", "legacy_unencumbered", ], - // large-scale-change unable to identify any license_text files + license_text: [], } java_defaults { @@ -140,6 +127,11 @@ android_library { "res", ], + licenses: [ + "Android-Apache-2.0", + "packages_apps_DocumentsUI_res_drawable_pd_license", + ], + aaptflags: [ "--auto-add-overlay", ], @@ -163,6 +155,11 @@ android_app { "res", ], + licenses: [ + "Android-Apache-2.0", + "packages_apps_DocumentsUI_res_drawable_pd_license", + ], + required: ["privapp_whitelist_com.android.documentsui"], min_sdk_version: "29", |