summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-02-16 22:23:29 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-16 22:23:29 +0000
commitf065787894ad10a6da13f4f6f99ce0bef19f6ce9 (patch)
tree6629c9c61262cbd94d561431b05d7b8249a999d2
parent6431b1b46098fab4398fb86e077816f3d14d302d (diff)
parent209328b5c7460f0eeb597b535f6082116a752804 (diff)
downloaderror_prone-f065787894ad10a6da13f4f6f99ce0bef19f6ce9.tar.gz
[LSC] Add LOCAL_LICENSE_KINDS to external/error_prone am: cbe9826c90 am: 209328b5c7
Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1588952 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I18da60e924520976b0ce806d3fc6e1cdaa2a207d
-rw-r--r--Android.bp34
-rw-r--r--soong/Android.bp9
2 files changed, 43 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 2a5255e..d7f9b99 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,40 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ default_applicable_licenses: ["external_error_prone_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_error_prone_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-BSD",
+ "SPDX-license-identifier-CPL-1.0",
+ "SPDX-license-identifier-EPL",
+ "SPDX-license-identifier-GPL",
+ "SPDX-license-identifier-GPL-2.0",
+ "SPDX-license-identifier-LGPL",
+ "SPDX-license-identifier-MIT",
+ ],
+ // large-scale-change unable to identify any license_text files
+}
+
java_import {
name: "error_prone_annotations",
host_supported: true,
diff --git a/soong/Android.bp b/soong/Android.bp
index 79fc457..f4110cf 100644
--- a/soong/Android.bp
+++ b/soong/Android.bp
@@ -1,3 +1,12 @@
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "external_error_prone_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["external_error_prone_license"],
+}
+
bootstrap_go_package {
name: "soong-java-config-error_prone",
pkgPath: "android/soong/java/config/error_prone",