Fix licenses and license texts. am: 597380ea4b

Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1959653

Change-Id: I454f9b9bb0aa6dfe49e82c6a84e87aef03c44d8c

1 files changed, 27 insertions, 19 deletions

diff --git a/Android.bp b/Android.bp
index 3087f5d..de7abce 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,34 +16,40 @@ 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
+// The below licenses are not used in this project. They are mentioned
+// in reference to components not stored here.
+//        "SPDX-license-identifier-BSD",
+//        "SPDX-license-identifier-CPL-1.0",
+//        "SPDX-license-identifier-EPL",
+//        "SPDX-license-identifier-LGPL",
 license {
     name: "external_error_prone_license",
+    package_name: "Google Error Prone",
     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-GPL-2.0-with-classpath-exception",
         "SPDX-license-identifier-MIT",
     ],
-    // large-scale-change unable to identify any license_text files
+    license_text: [
+        "jFormatString/LICENSE",
+        "javac/LICENSE",
+        "checkerframework/LICENSE",
+        "jimfs/LICENSE",
+        "error_prone/LICENSE",
+    ],
+}
+
+license {
+    name: "external_error_prone_error_prone_license",
+    package_name: "Google Error Prone",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: [
+        "error_prone/LICENSE",
+        "jimfs/LICENSE",
+    ],
 }
 
 java_import {
@@ -51,6 +57,7 @@ java_import {
     host_supported: true,
     jars: ["error_prone/error_prone_annotations-2.10.0.jar"],
     min_sdk_version : "29",
+    licenses: ["external_error_prone_error_prone_license"],
     apex_available: [
         "//apex_available:anyapex",
         "//apex_available:platform",
@@ -73,6 +80,7 @@ java_import {
 java_import {
     name:  "error_prone_test_helpers",
     host_supported: true,
+    licenses: ["external_error_prone_error_prone_license"],
     jars: [
         "error_prone/error_prone_test_helpers-2.10.0.jar",
         "jimfs/jimfs-1.1.jar",