Split up errorprone licenses am: ffaf26160b

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

Change-Id: Ibab8ac52584d1ec371705ef237ac1523cf93c254

6 files changed, 179 insertions, 69 deletions

diff --git a/Android.bp b/Android.bp
index caf1c41..2188f18 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,6 +14,7 @@
 
 package {
     default_applicable_licenses: ["external_error_prone_license"],
+    default_visibility: ["//external/error_prone"],
 }
 
 // See: http://go/android-license-faq
@@ -27,37 +28,16 @@ license {
     name: "external_error_prone_license",
     package_name: "Google Error Prone",
     visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-GPL-2.0",
-        "SPDX-license-identifier-GPL-2.0-with-classpath-exception",
-        "SPDX-license-identifier-MIT",
-    ],
-    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",
-    ],
+    license_text: ["error_prone/LICENSE"],
 }
 
 java_import {
     name: "error_prone_annotations",
     host_supported: true,
+    visibility: ["//visibility:public"],
     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",
@@ -65,25 +45,32 @@ java_import {
 }
 
 java_import {
-    name: "error_prone_core",
+    name: "error_prone_core_jars",
     host_supported: true,
     jars: [
-        "checkerframework/dataflow-errorprone-3.15.0.jar",
         "error_prone/error_prone_core-2.10.0-with-dependencies.jar",
         "error_prone/error_prone_annotations-2.10.0.jar",
-        "javac/javac-9+181-r4173-1.jar",
-        "jFormatString/jFormatString-3.0.0.jar",
+    ],
+}
+
+java_library {
+    name: "error_prone_core",
+    host_supported: true,
+    visibility: ["//visibility:public"],
+    static_libs: [
+        "error_prone_checkerframework_dataflow_errorprone",
+        "error_prone_core_jars",
+        "error_prone_javac",
+        "error_prone_jFormatString",
     ],
 }
 
 java_import {
     name:  "error_prone_test_helpers",
     host_supported: true,
-    licenses: ["external_error_prone_error_prone_license"],
+    visibility: ["//visibility:public"],
     jars: [
         "error_prone/error_prone_test_helpers-2.10.0.jar",
         "jimfs/jimfs-1.1.jar",
     ],
 }
-
-subdirs = ["soong"]
diff --git a/checkerframework/Android.bp b/checkerframework/Android.bp
new file mode 100644
index 0000000..1b246c9
--- /dev/null
+++ b/checkerframework/Android.bp
@@ -0,0 +1,34 @@
+// Copyright (C) 2022 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package {
+    default_applicable_licenses: ["external_error_prone_checkerframework_license"],
+}
+
+license {
+    name: "external_error_prone_checkerframework_license",
+    package_name: "Google Error Prone checkerframework",
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-GPL-2.0-with-classpath-exception",
+        "SPDX-license-identifier-MIT",
+    ],
+    license_text: ["LICENSE"],
+}
+
+java_import {
+    name: "error_prone_checkerframework_dataflow_errorprone",
+    host_supported: true,
+    jars: ["dataflow-errorprone-3.15.0.jar"],
+}
diff --git a/checkerframework/LICENSE b/checkerframework/LICENSE
index a462db4..827585f 100644
--- a/checkerframework/LICENSE
+++ b/checkerframework/LICENSE
@@ -1,45 +1,42 @@
-The Checker Framework is licensed under the GNU General Public License,
-version 2 (GPL2), with the classpath exception.  The text of this license
-appears below.  This is the same license used for OpenJDK.
-
-A few parts of the Checker Framework have more permissive licenses.
-
- * The annotations are licensed under the MIT License.  (The text of this
-   license appears below.)  More specifically, all the parts of the Checker
-   Framework that you might want to include with your own program use the
-   MIT License.  This is the checker-qual.jar file and all the files that
-   appear in it:  every file in a qual/ directory, plus NullnessUtils.java
-   and RegexUtil.java.  In addition, the cleanroom implementations of
-   third-party annotations, which the Checker Framework recognizes as
-   aliases for its own annotations, are licensed under the MIT License.
-
- * The Maven plugin is dual-licensed (you may use whichever you prefer)
-   under GPL2 and the Apache License, version 2.0 (Apache2).  The text of
-   Apache2 appears in file maven-plugin/LICENSE.txt.  Maven itself uses
-   Apache2.
-
- * The Eclipse plugin is dual-licensed (you may use whichever you prefer)
-   under GPL2 and the Eclipse Public License Version 1.0 (EPL).  EPL
-   appears http://www.eclipse.org/org/documents/epl-v10.php.  Eclipse
-   itself uses EPL.
-
-Some external libraries that are included with the Checker Framework have
-different licenses.
-
- * javaparser is licensed under the LGPL.  (The javaparser source code
-   contains a file with the text of the GPL, but it is not clear why, since
-   javaparser does not use the GPL.)  See file javaparser/COPYING.LESSER
-   and the source code of all its files.
+The Checker Framework
+Copyright 2004-present by the Checker Framework developers
+
+
+Most of the Checker Framework is licensed under the GNU General Public
+License, version 2 (GPL2), with the classpath exception.  The text of this
+license appears below.  This is the same license used for OpenJDK.
+
+A few parts of the Checker Framework have more permissive licenses, notably
+the parts that you might want to include with your own program.
 
- * junit is licensed under the Common Public License v1.0 (see
-   http://www.junit.org/license), with parts (Hamcrest) licensed under the
-   BSD License (see LICENSE.txt in checkers/tests/junit.jar ).
+ * The annotations and utility files are licensed under the MIT License.
+   (The text of this license also appears below.)  This applies to
+   checker-qual*.jar and checker-util.jar and all the files that appear in
+   them, which is all files in checker-qual and checker-util directories.
+   It also applies to the cleanroom implementations of
+   third-party annotations (in checker/src/testannotations/,
+   framework/src/main/java/org/jmlspecs/, and
+   framework/src/main/java/com/google/).
+
+The Checker Framework includes annotations for some libraries.  Those in
+.astub files use the MIT License.  Those in https://github.com/typetools/jdk
+(which appears in the annotated-jdk directory of file checker.jar) use the
+GPL2 license.
+
+Some external libraries that are included with the Checker Framework
+distribution have different licenses.  Here are some examples.
+
+ * JavaParser is dual licensed under the LGPL or the Apache license -- you
+   may use it under whichever one you want.  (The JavaParser source code
+   contains a file with the text of the GPL, but it is not clear why, since
+   JavaParser does not use the GPL.)  See
+   https://github.com/typetools/stubparser .
 
- * plume-lib is licensed under the MIT License.
+ * Annotation Tools (https://github.com/typetools/annotation-tools) uses
+   the MIT license.
 
-The Checker Framework includes annotations for several libraries, in
-directory checkers/jdk/.  The only one that uses a different license than
-the GPL is Google Guava, which uses Apache2.
+ * Libraries in plume-lib (https://github.com/plume-lib/) are licensed
+   under the MIT License.
 
 ===========================================================================
 
diff --git a/jFormatString/Android.bp b/jFormatString/Android.bp
new file mode 100644
index 0000000..cba341b
--- /dev/null
+++ b/jFormatString/Android.bp
@@ -0,0 +1,32 @@
+// Copyright (C) 2022 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package {
+    default_applicable_licenses: ["external_error_prone_jFormatString_license"],
+}
+
+license {
+    name: "external_error_prone_jFormatString_license",
+    package_name: "Google Error Prone jFormatString",
+    license_kinds: [
+        "SPDX-license-identifier-GPL-2.0-with-classpath-exception",
+    ],
+    license_text: ["LICENSE"],
+}
+
+java_import {
+    name: "error_prone_jFormatString",
+    host_supported: true,
+    jars: ["jFormatString-3.0.0.jar"],
+}
diff --git a/javac/Android.bp b/javac/Android.bp
new file mode 100644
index 0000000..d9d74b8
--- /dev/null
+++ b/javac/Android.bp
@@ -0,0 +1,30 @@
+// Copyright (C) 2022 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package {
+    default_applicable_licenses: ["external_error_prone_javac_license"],
+}
+
+license {
+    name: "external_error_prone_javac_license",
+    package_name: "Google Error Prone javac",
+    license_kinds: ["SPDX-license-identifier-GPL-2.0-with-classpath-exception"],
+    license_text: ["LICENSE"],
+}
+
+java_import {
+    name: "error_prone_javac",
+    host_supported: true,
+    jars: ["javac-9+181-r4173-1.jar"],
+}
diff --git a/jimfs/Android.bp b/jimfs/Android.bp
index e69de29..92dc153 100644
--- a/jimfs/Android.bp
+++ b/jimfs/Android.bp
@@ -0,0 +1,30 @@
+// Copyright (C) 2022 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package {
+    default_applicable_licenses: ["external_error_prone_jimfs_license"],
+}
+
+license {
+    name: "external_error_prone_jimfs_license",
+    package_name: "Google Error Prone jimfs",
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["LICENSE"],
+}
+
+java_import {
+    name: "error_prone_jimfs",
+    host_supported: true,
+    jars: ["jimfs-1.1.jar"],
+}