diff options
| author | Bob Badour <bbadour@google.com> | 2021-09-04 00:53:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-04 00:53:46 +0000 |
| commit | 84af7ecf6ae45a2ab3aba9b0019baa191b430af5 (patch) | |
| tree | 2ba30a68b1e5a2246c7e071219139cea61cab0e6 | |
| parent | 9ad2a57deaeedef17fb4e37538f9d4cc84ad25fa (diff) | |
| parent | 4bc189377da5f3cb27fb439d677cb89f3390a7a6 (diff) | |
| download | platform_packages_apps_DocumentsUI-84af7ecf6ae45a2ab3aba9b0019baa191b430af5.tar.gz platform_packages_apps_DocumentsUI-84af7ecf6ae45a2ab3aba9b0019baa191b430af5.tar.bz2 platform_packages_apps_DocumentsUI-84af7ecf6ae45a2ab3aba9b0019baa191b430af5.zip | |
Fix license text -- switch to Android-Apache-2.0 am: 4bc189377d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/1745199
Change-Id: I64e7be8bd815a3f3bf84277ffb9ea801a5dceb24
| -rw-r--r-- | Android.bp | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/Android.bp b/Android.bp index 88ebebadd..a1e4f0d77 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 { @@ -142,6 +129,11 @@ android_library { "res", ], + licenses: [ + "Android-Apache-2.0", + "packages_apps_DocumentsUI_res_drawable_pd_license", + ], + aaptflags: [ "--auto-add-overlay", ], @@ -166,6 +158,11 @@ android_app { "res", ], + licenses: [ + "Android-Apache-2.0", + "packages_apps_DocumentsUI_res_drawable_pd_license", + ], + required: ["privapp_whitelist_com.android.documentsui"], target_sdk_version: "30", |