summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-02-17 17:22:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-17 17:22:12 +0000
commit375c1d95c69bd689411b6d906caacfd34ae09a18 (patch)
tree0bdb4282c7f04f83149901b7ffe77213a5a14d5d
parent3696b55a866093f0169fa509c273c3538ca59165 (diff)
parent6db8342e071833f15cabe02dd701e21778eddf73 (diff)
downloadppp-375c1d95c69bd689411b6d906caacfd34ae09a18.tar.gz
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/ppp" am: a66109ce89 am: 900d123b62 am: 6db8342e07
Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/1588521 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icfa685b969924be770f6590da43c19b91b5430b0
-rw-r--r--Android.bp35
-rw-r--r--pppd/Android.bp37
2 files changed, 72 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 3704241..1a3f3ae 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,4 +12,39 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ default_applicable_licenses: ["external_ppp_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_ppp_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-0BSD",
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-BSD",
+ "SPDX-license-identifier-GPL",
+ "SPDX-license-identifier-GPL-2.0",
+ "SPDX-license-identifier-LGPL",
+ "SPDX-license-identifier-MIT",
+ "legacy_notice",
+ "legacy_unencumbered",
+ ],
+ // large-scale-change unable to identify any license_text files
+}
+
subdirs = ["pppd"]
diff --git a/pppd/Android.bp b/pppd/Android.bp
index 92b4cbd..e3138a3 100644
--- a/pppd/Android.bp
+++ b/pppd/Android.bp
@@ -12,6 +12,43 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ default_applicable_licenses: ["external_ppp_pppd_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_ppp_pppd_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-0BSD",
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-BSD",
+ "SPDX-license-identifier-GPL",
+ "SPDX-license-identifier-GPL-2.0",
+ "SPDX-license-identifier-LGPL",
+ "SPDX-license-identifier-MIT",
+ "legacy_notice",
+ "legacy_unencumbered",
+ ],
+ license_text: [
+ "NOTICE",
+ ],
+}
+
cc_defaults {
name: "ppp_defaults",
cflags: [