diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-16 19:41:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 19:41:24 +0000 |
commit | 85eb69b8d881826826ff0ffb8e01b2298935d218 (patch) | |
tree | adc478ed2a19d5d6c7b5ea210afcb2bf055b32d7 | |
parent | 71c70f4ceda9880d51a9e99b3820934872110649 (diff) | |
parent | 93094e8329f9d4b002b29d736df572fea1264295 (diff) | |
download | sqlite-85eb69b8d881826826ff0ffb8e01b2298935d218.tar.gz |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/sqlite" am: 1ef942bf52 am: 92ba6ff006 am: 93094e8329
Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/1589012
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie247a2c0503a207e7ff2b981cd245f8f496fcb07
-rw-r--r-- | Android.bp | 28 | ||||
-rw-r--r-- | android/Android.bp | 17 | ||||
-rw-r--r-- | dist/Android.bp | 30 |
3 files changed, 75 insertions, 0 deletions
@@ -1,3 +1,31 @@ +package { + default_applicable_licenses: ["external_sqlite_license"], +} + +// 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: "external_sqlite_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "legacy_permissive", + ], + // large-scale-change unable to identify any license_text files +} + subdirs = [ "android", "dist", diff --git a/android/Android.bp b/android/Android.bp index 44b2d56..3c32bdd 100644 --- a/android/Android.bp +++ b/android/Android.bp @@ -1,3 +1,20 @@ +package { + default_applicable_licenses: ["external_sqlite_android_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "external_sqlite_android_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + cc_library_static { name: "libsqlite3_android", vendor_available: true, diff --git a/dist/Android.bp b/dist/Android.bp index ff4df1e..a947873 100644 --- a/dist/Android.bp +++ b/dist/Android.bp @@ -4,6 +4,36 @@ // // +package { + default_applicable_licenses: ["external_sqlite_dist_license"], +} + +// 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: "external_sqlite_dist_license", + visibility: [":__subpackages__"], + license_kinds: [ + "legacy_permissive", + "legacy_unencumbered", + ], + license_text: [ + "NOTICE", + ], +} + cc_defaults { name: "sqlite-minimal-defaults", host_supported: true, |