diff options
| author | Bob Badour <bbadour@google.com> | 2022-10-17 20:08:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-10-17 20:08:45 +0000 |
| commit | f6d1050e60e8138bd34b5820c544f77fec464a6a (patch) | |
| tree | 777a0b71d4387eb30953f26065d57f6c77e024fa | |
| parent | e2b72e6bb2d6fc078f5d307eace67150907ecd7f (diff) | |
| parent | d088ad937efe5b4d65e3bb0a06dae3ad468a5361 (diff) | |
| download | cpython3-f6d1050e60e8138bd34b5820c544f77fec464a6a.tar.gz | |
Clarify licensing -- GPL does not apply am: e754edc259 am: d088ad937e
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2254806
Change-Id: I43c67aafb901c67457c5dced7c425efb9280d6ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/Android.bp b/Android.bp index 5b8fac2286..d7e8449692 100644 --- a/Android.bp +++ b/Android.bp @@ -19,19 +19,6 @@ package { default_applicable_licenses: ["external_python_cpython3_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_python_cpython3_license", @@ -41,7 +28,6 @@ license { "SPDX-license-identifier-Apache-2.0", "SPDX-license-identifier-BSD", "SPDX-license-identifier-CC0-1.0", - "SPDX-license-identifier-GPL", "SPDX-license-identifier-MIT", "SPDX-license-identifier-MS-RL", // by exception only "SPDX-license-identifier-PSF-2.0", @@ -51,6 +37,7 @@ license { "legacy_by_exception_only", // by exception only "legacy_notice", "legacy_unencumbered", + // GPL removed. All GPL code either Autoconf exception or dual-licensed PSF ], license_text: [ "LICENSE", |