Merge remote-tracking branch 'upstream/master'

* upstream/master:
  [LSC] Add LOCAL_LICENSE_KINDS to external/sqlite

Author: grendello

Android.bp

@@ -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",

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,

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,