diff options
32 files changed, 2 insertions, 311 deletions
diff --git a/Android.bp b/Android.bp index e3d8c85b33..03930c6bb2 100644 --- a/Android.bp +++ b/Android.bp @@ -1,44 +1,3 @@ -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: [ @@ -51,9 +10,8 @@ cc_defaults { "-pedantic", "-Wno-cast-qual", "-Wno-long-long", - "-Wno-unreachable-code-loop-increment", - "-Wno-unused-lambda-capture", "-Wno-unused-private-field", + "-Wno-unused-lambda-capture", ], include_dirs: [ @@ -102,7 +60,6 @@ clang_generated_headers = [ cc_library_headers { name: "clang-headers", vendor_available: true, - product_available: true, host_supported: true, // TODO(b/153609531): remove when no longer needed. native_bridge_supported: true, diff --git a/METADATA b/METADATA deleted file mode 100644 index d97975ca3b..0000000000 --- a/METADATA +++ /dev/null @@ -1,3 +0,0 @@ -third_party { - license_type: NOTICE -} diff --git a/clang-version-inc.py b/clang-version-inc.py index d55d25f8ec..eeffb625cc 100755 --- a/clang-version-inc.py +++ b/clang-version-inc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python import os import sys diff --git a/lib/ARCMigrate/Android.bp b/lib/ARCMigrate/Android.bp index 5d2c7f9497..3a799aed6e 100644 --- a/lib/ARCMigrate/Android.bp +++ b/lib/ARCMigrate/Android.bp @@ -1,12 +1,3 @@ -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 6618768fc0..5579bb5a2e 100644 --- a/lib/AST/Android.bp +++ b/lib/AST/Android.bp @@ -1,12 +1,3 @@ -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 09e67549f0..dbdf173628 100644 --- a/lib/ASTMatchers/Android.bp +++ b/lib/ASTMatchers/Android.bp @@ -1,12 +1,3 @@ -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 0fe899acbf..cb9300ce0f 100644 --- a/lib/Analysis/Android.bp +++ b/lib/Analysis/Android.bp @@ -1,12 +1,3 @@ -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 99b29fff05..b44c296012 100644 --- a/lib/Android.bp +++ b/lib/Android.bp @@ -1,11 +1 @@ -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 166dc1b754..e2318a1ed3 100644 --- a/lib/Basic/Android.bp +++ b/lib/Basic/Android.bp @@ -1,12 +1,3 @@ -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 3b64065904..ca1bce03ae 100644 --- a/lib/CodeGen/Android.bp +++ b/lib/CodeGen/Android.bp @@ -1,12 +1,3 @@ -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 b58748f531..5e6858d184 100644 --- a/lib/Driver/Android.bp +++ b/lib/Driver/Android.bp @@ -1,12 +1,3 @@ -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 f6569e961a..ec7e358c6c 100644 --- a/lib/Edit/Android.bp +++ b/lib/Edit/Android.bp @@ -1,12 +1,3 @@ -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 40a6cd13e7..c61e5bb22a 100644 --- a/lib/Format/Android.bp +++ b/lib/Format/Android.bp @@ -1,12 +1,3 @@ -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 1bb9b39d97..ab539cfdf8 100644 --- a/lib/Frontend/Android.bp +++ b/lib/Frontend/Android.bp @@ -1,12 +1,3 @@ -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 fcdd04bdb7..6508a125bb 100644 --- a/lib/Frontend/Rewrite/Android.bp +++ b/lib/Frontend/Rewrite/Android.bp @@ -1,12 +1,3 @@ -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 0e33bbc84a..4d63425864 100644 --- a/lib/FrontendTool/Android.bp +++ b/lib/FrontendTool/Android.bp @@ -1,12 +1,3 @@ -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 255f02e4ff..b1e93064bd 100644 --- a/lib/Index/Android.bp +++ b/lib/Index/Android.bp @@ -1,12 +1,3 @@ -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 8e9bd79b55..c8a8bd87c5 100644 --- a/lib/Lex/Android.bp +++ b/lib/Lex/Android.bp @@ -1,12 +1,3 @@ -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 4687f1d469..4bc2b7cfee 100644 --- a/lib/Parse/Android.bp +++ b/lib/Parse/Android.bp @@ -1,12 +1,3 @@ -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 e6b556d138..ea657e2f54 100644 --- a/lib/Rewrite/Android.bp +++ b/lib/Rewrite/Android.bp @@ -1,12 +1,3 @@ -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 13ca9d6900..02c0dda209 100644 --- a/lib/Sema/Android.bp +++ b/lib/Sema/Android.bp @@ -1,12 +1,3 @@ -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 6f49ce85ec..5f3762faa8 100644 --- a/lib/Serialization/Android.bp +++ b/lib/Serialization/Android.bp @@ -1,12 +1,3 @@ -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 4fe1a8cfad..b44c296012 100644 --- a/lib/StaticAnalyzer/Android.bp +++ b/lib/StaticAnalyzer/Android.bp @@ -1,10 +1 @@ -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 0880b0c522..42136154b9 100644 --- a/lib/StaticAnalyzer/Checkers/Android.bp +++ b/lib/StaticAnalyzer/Checkers/Android.bp @@ -1,12 +1,3 @@ -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 dafa1c90fb..1e0a78def2 100644 --- a/lib/StaticAnalyzer/Checkers/MPI-Checker/Android.bp +++ b/lib/StaticAnalyzer/Checkers/MPI-Checker/Android.bp @@ -1,12 +1,3 @@ -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 74859ac564..80f391202a 100644 --- a/lib/StaticAnalyzer/Core/Android.bp +++ b/lib/StaticAnalyzer/Core/Android.bp @@ -1,12 +1,3 @@ -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 bec40c6fa5..975d3a4f92 100644 --- a/lib/StaticAnalyzer/Frontend/Android.bp +++ b/lib/StaticAnalyzer/Frontend/Android.bp @@ -1,12 +1,3 @@ -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 cff0e4ae67..118eece702 100644 --- a/lib/Tooling/Android.bp +++ b/lib/Tooling/Android.bp @@ -1,12 +1,3 @@ -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 dfd3a70d23..517b9bbc99 100644 --- a/lib/Tooling/Core/Android.bp +++ b/lib/Tooling/Core/Android.bp @@ -1,12 +1,3 @@ -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 06dae74728..fecbf7bdd9 100644 --- a/soong/Android.bp +++ b/soong/Android.bp @@ -1,12 +1,3 @@ -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 67dcb6b836..a55cbcf691 100644 --- a/tools/libclang/Android.bp +++ b/tools/libclang/Android.bp @@ -1,12 +1,3 @@ -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 6bfbce73a1..c42a7a0111 100644 --- a/utils/TableGen/Android.bp +++ b/utils/TableGen/Android.bp @@ -1,13 +1,3 @@ -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"], |