aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-02-17 20:28:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-17 20:28:30 +0000
commit3d279d03a957d5d3c770fa6a778373c4906cb910 (patch)
tree28da730405effc787655ce612d030b4e8c83df0d
parentefba4fd527130516d3a69179973a5c5919c264ba (diff)
parent8fb6ebbcfcfa00f6e629e4b3e42266fb25096d6c (diff)
downloadclang-3d279d03a957d5d3c770fa6a778373c4906cb910.tar.gz
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/clang" am: ed24341bdf am: 825d81cdf6 am: 7abc7a9fd2 am: 8fb6ebbcfc
Original change: https://android-review.googlesource.com/c/platform/external/clang/+/1587409 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie8597353c7285ae7771c00a3e2b7821df20d0a1c
-rw-r--r--Android.bp41
-rw-r--r--lib/ARCMigrate/Android.bp9
-rw-r--r--lib/AST/Android.bp9
-rw-r--r--lib/ASTMatchers/Android.bp9
-rw-r--r--lib/Analysis/Android.bp9
-rw-r--r--lib/Android.bp10
-rw-r--r--lib/Basic/Android.bp9
-rw-r--r--lib/CodeGen/Android.bp9
-rw-r--r--lib/Driver/Android.bp9
-rw-r--r--lib/Edit/Android.bp9
-rw-r--r--lib/Format/Android.bp9
-rw-r--r--lib/Frontend/Android.bp9
-rw-r--r--lib/Frontend/Rewrite/Android.bp9
-rw-r--r--lib/FrontendTool/Android.bp9
-rw-r--r--lib/Index/Android.bp9
-rw-r--r--lib/Lex/Android.bp9
-rw-r--r--lib/Parse/Android.bp9
-rw-r--r--lib/Rewrite/Android.bp9
-rw-r--r--lib/Sema/Android.bp9
-rw-r--r--lib/Serialization/Android.bp9
-rw-r--r--lib/StaticAnalyzer/Android.bp9
-rw-r--r--lib/StaticAnalyzer/Checkers/Android.bp9
-rw-r--r--lib/StaticAnalyzer/Checkers/MPI-Checker/Android.bp9
-rw-r--r--lib/StaticAnalyzer/Core/Android.bp9
-rw-r--r--lib/StaticAnalyzer/Frontend/Android.bp9
-rw-r--r--lib/Tooling/Android.bp9
-rw-r--r--lib/Tooling/Core/Android.bp9
-rw-r--r--soong/Android.bp9
-rw-r--r--tools/libclang/Android.bp9
-rw-r--r--utils/TableGen/Android.bp10
30 files changed, 304 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 2281e3d9f8..e3d8c85b33 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,44 @@
+package {
+ default_applicable_licenses: ["external_clang_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.
+//
+// large-scale-change included anything that looked like it might be a license
+// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
+//
+// Please consider removing redundant or irrelevant files from 'license_text:'.
+//
+// large-scale-change filtered out the below license kinds as false-positives:
+// SPDX-license-identifier-GPL
+// See: http://go/android-license-faq
+license {
+ name: "external_clang_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-BSD",
+ "SPDX-license-identifier-MIT",
+ "SPDX-license-identifier-NCSA",
+ ],
+ license_text: [
+ "LICENSE.TXT",
+ "NOTICE",
+ ],
+}
+
cc_defaults {
name: "clang-defaults",
defaults: [
diff --git a/lib/ARCMigrate/Android.bp b/lib/ARCMigrate/Android.bp
index 3a799aed6e..5d2c7f9497 100644
--- a/lib/ARCMigrate/Android.bp
+++ b/lib/ARCMigrate/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_static {
name: "libclangARCMigrate",
defaults: ["clang-defaults"],
diff --git a/lib/AST/Android.bp b/lib/AST/Android.bp
index 5579bb5a2e..6618768fc0 100644
--- a/lib/AST/Android.bp
+++ b/lib/AST/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_static {
name: "libclangAST",
defaults: ["clang-defaults"],
diff --git a/lib/ASTMatchers/Android.bp b/lib/ASTMatchers/Android.bp
index dbdf173628..09e67549f0 100644
--- a/lib/ASTMatchers/Android.bp
+++ b/lib/ASTMatchers/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_static {
name: "libclangASTMatchers",
defaults: ["clang-defaults"],
diff --git a/lib/Analysis/Android.bp b/lib/Analysis/Android.bp
index cb9300ce0f..0fe899acbf 100644
--- a/lib/Analysis/Android.bp
+++ b/lib/Analysis/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_static {
name: "libclangAnalysis",
defaults: ["clang-defaults"],
diff --git a/lib/Android.bp b/lib/Android.bp
index b44c296012..99b29fff05 100644
--- a/lib/Android.bp
+++ b/lib/Android.bp
@@ -1 +1,11 @@
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "external_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-MIT
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
subdirs = ["*"]
diff --git a/lib/Basic/Android.bp b/lib/Basic/Android.bp
index e2318a1ed3..166dc1b754 100644
--- a/lib/Basic/Android.bp
+++ b/lib/Basic/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_static {
name: "libclangBasic",
defaults: ["clang-defaults"],
diff --git a/lib/CodeGen/Android.bp b/lib/CodeGen/Android.bp
index ca1bce03ae..3b64065904 100644
--- a/lib/CodeGen/Android.bp
+++ b/lib/CodeGen/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_static {
name: "libclangCodeGen",
defaults: ["clang-defaults"],
diff --git a/lib/Driver/Android.bp b/lib/Driver/Android.bp
index 5e6858d184..b58748f531 100644
--- a/lib/Driver/Android.bp
+++ b/lib/Driver/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_static {
name: "libclangDriver",
defaults: ["clang-defaults"],
diff --git a/lib/Edit/Android.bp b/lib/Edit/Android.bp
index ec7e358c6c..f6569e961a 100644
--- a/lib/Edit/Android.bp
+++ b/lib/Edit/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_static {
name: "libclangEdit",
defaults: ["clang-defaults"],
diff --git a/lib/Format/Android.bp b/lib/Format/Android.bp
index c61e5bb22a..40a6cd13e7 100644
--- a/lib/Format/Android.bp
+++ b/lib/Format/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_static {
name: "libclangFormat",
defaults: ["clang-defaults"],
diff --git a/lib/Frontend/Android.bp b/lib/Frontend/Android.bp
index ab539cfdf8..1bb9b39d97 100644
--- a/lib/Frontend/Android.bp
+++ b/lib/Frontend/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_static {
name: "libclangFrontend",
defaults: ["clang-defaults"],
diff --git a/lib/Frontend/Rewrite/Android.bp b/lib/Frontend/Rewrite/Android.bp
index 6508a125bb..fcdd04bdb7 100644
--- a/lib/Frontend/Rewrite/Android.bp
+++ b/lib/Frontend/Rewrite/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_static {
name: "libclangRewriteFrontend",
defaults: ["clang-defaults"],
diff --git a/lib/FrontendTool/Android.bp b/lib/FrontendTool/Android.bp
index 4d63425864..0e33bbc84a 100644
--- a/lib/FrontendTool/Android.bp
+++ b/lib/FrontendTool/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_host_static {
name: "libclangFrontendTool",
defaults: ["clang-defaults"],
diff --git a/lib/Index/Android.bp b/lib/Index/Android.bp
index b1e93064bd..255f02e4ff 100644
--- a/lib/Index/Android.bp
+++ b/lib/Index/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_static {
name: "libclangIndex",
defaults: ["clang-defaults"],
diff --git a/lib/Lex/Android.bp b/lib/Lex/Android.bp
index c8a8bd87c5..8e9bd79b55 100644
--- a/lib/Lex/Android.bp
+++ b/lib/Lex/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_static {
name: "libclangLex",
defaults: ["clang-defaults"],
diff --git a/lib/Parse/Android.bp b/lib/Parse/Android.bp
index 4bc2b7cfee..4687f1d469 100644
--- a/lib/Parse/Android.bp
+++ b/lib/Parse/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_static {
name: "libclangParse",
defaults: ["clang-defaults"],
diff --git a/lib/Rewrite/Android.bp b/lib/Rewrite/Android.bp
index ea657e2f54..e6b556d138 100644
--- a/lib/Rewrite/Android.bp
+++ b/lib/Rewrite/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_static {
name: "libclangRewrite",
defaults: ["clang-defaults"],
diff --git a/lib/Sema/Android.bp b/lib/Sema/Android.bp
index 02c0dda209..13ca9d6900 100644
--- a/lib/Sema/Android.bp
+++ b/lib/Sema/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_static {
name: "libclangSema",
defaults: ["clang-defaults"],
diff --git a/lib/Serialization/Android.bp b/lib/Serialization/Android.bp
index 5f3762faa8..6f49ce85ec 100644
--- a/lib/Serialization/Android.bp
+++ b/lib/Serialization/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_static {
name: "libclangSerialization",
defaults: ["clang-defaults"],
diff --git a/lib/StaticAnalyzer/Android.bp b/lib/StaticAnalyzer/Android.bp
index b44c296012..4fe1a8cfad 100644
--- a/lib/StaticAnalyzer/Android.bp
+++ b/lib/StaticAnalyzer/Android.bp
@@ -1 +1,10 @@
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "external_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
subdirs = ["*"]
diff --git a/lib/StaticAnalyzer/Checkers/Android.bp b/lib/StaticAnalyzer/Checkers/Android.bp
index 42136154b9..0880b0c522 100644
--- a/lib/StaticAnalyzer/Checkers/Android.bp
+++ b/lib/StaticAnalyzer/Checkers/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_host_static {
name: "libclangStaticAnalyzerCheckers",
defaults: ["clang-defaults"],
diff --git a/lib/StaticAnalyzer/Checkers/MPI-Checker/Android.bp b/lib/StaticAnalyzer/Checkers/MPI-Checker/Android.bp
index 1e0a78def2..dafa1c90fb 100644
--- a/lib/StaticAnalyzer/Checkers/MPI-Checker/Android.bp
+++ b/lib/StaticAnalyzer/Checkers/MPI-Checker/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_static {
name: "libclangStaticAnalyzerMPIChecker",
defaults: ["clang-defaults"],
diff --git a/lib/StaticAnalyzer/Core/Android.bp b/lib/StaticAnalyzer/Core/Android.bp
index 80f391202a..74859ac564 100644
--- a/lib/StaticAnalyzer/Core/Android.bp
+++ b/lib/StaticAnalyzer/Core/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_host_static {
name: "libclangStaticAnalyzerCore",
defaults: ["clang-defaults"],
diff --git a/lib/StaticAnalyzer/Frontend/Android.bp b/lib/StaticAnalyzer/Frontend/Android.bp
index 975d3a4f92..bec40c6fa5 100644
--- a/lib/StaticAnalyzer/Frontend/Android.bp
+++ b/lib/StaticAnalyzer/Frontend/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_host_static {
name: "libclangStaticAnalyzerFrontend",
defaults: ["clang-defaults"],
diff --git a/lib/Tooling/Android.bp b/lib/Tooling/Android.bp
index 118eece702..cff0e4ae67 100644
--- a/lib/Tooling/Android.bp
+++ b/lib/Tooling/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_static {
name: "libclangTooling",
defaults: ["clang-defaults"],
diff --git a/lib/Tooling/Core/Android.bp b/lib/Tooling/Core/Android.bp
index 517b9bbc99..dfd3a70d23 100644
--- a/lib/Tooling/Core/Android.bp
+++ b/lib/Tooling/Core/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_static {
name: "libclangToolingCore",
defaults: ["clang-defaults"],
diff --git a/soong/Android.bp b/soong/Android.bp
index fecbf7bdd9..06dae74728 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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["external_clang_license"],
+}
+
bootstrap_go_package {
name: "soong-clang",
pkgPath: "android/soong/external/clang",
diff --git a/tools/libclang/Android.bp b/tools/libclang/Android.bp
index a55cbcf691..67dcb6b836 100644
--- a/tools/libclang/Android.bp
+++ b/tools/libclang/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_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_library_static {
name: "libclangLibclang",
defaults: ["clang-defaults"],
diff --git a/utils/TableGen/Android.bp b/utils/TableGen/Android.bp
index c42a7a0111..6bfbce73a1 100644
--- a/utils/TableGen/Android.bp
+++ b/utils/TableGen/Android.bp
@@ -1,3 +1,13 @@
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "external_clang_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-MIT
+ // SPDX-license-identifier-NCSA
+ default_applicable_licenses: ["external_clang_license"],
+}
+
cc_binary_host {
name: "clang-tblgen",
defaults: ["llvm-defaults"],