diff options
author | Bob Badour <bbadour@google.com> | 2021-02-16 23:02:26 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 23:02:26 +0000 |
commit | e818d8e6cf5abce0653a87439864abeaecd6e47c (patch) | |
tree | 6629c9c61262cbd94d561431b05d7b8249a999d2 | |
parent | 2d75d5b72572bdf6e9675aee68f773e6bf9b6ad2 (diff) | |
parent | f065787894ad10a6da13f4f6f99ce0bef19f6ce9 (diff) | |
download | error_prone-e818d8e6cf5abce0653a87439864abeaecd6e47c.tar.gz |
[LSC] Add LOCAL_LICENSE_KINDS to external/error_prone am: cbe9826c90 am: 209328b5c7 am: f065787894
Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1588952
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia628ca6b738b12977e26450e78cd56ffd3536b93
-rw-r--r-- | Android.bp | 34 | ||||
-rw-r--r-- | soong/Android.bp | 9 |
2 files changed, 43 insertions, 0 deletions
@@ -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", |