diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-02-22 01:13:45 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-22 01:13:45 +0000 |
commit | 50d9831703106075a59e9947ce1c09a2b62da538 (patch) | |
tree | 5021105a70589c0df99879487aa8f030760d81d7 | |
parent | a49e0855f68de8284e92cc44760a4339fe3961c1 (diff) | |
parent | bebbf3d707de56cea85df81401f911cc296a9941 (diff) | |
download | cryptography-android12-gsi.tar.gz |
Snap for 7161250 from 104d218456a1d4f2f71a14c2c112b4ca24fe7310 to sc-release am: bebbf3d707android12-gsi
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/cryptography/+/13657608
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I547159a7faf3042fdf2c4996c948f24e42565fbb
-rw-r--r-- | Android.bp | 52 | ||||
-rw-r--r-- | src/cryptography/Android.bp | 10 |
2 files changed, 62 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 000000000..9c5499175 --- /dev/null +++ b/Android.bp @@ -0,0 +1,52 @@ +// +// Copyright (C) 2021 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package { + default_applicable_licenses: ["external_python_cryptography_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:'. +// See: http://go/android-license-faq +license { + name: "external_python_cryptography_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-BSD", + ], + license_text: [ + "LICENSE", + "LICENSE.APACHE", + "LICENSE.BSD", + "LICENSE.PSF", + ], +} diff --git a/src/cryptography/Android.bp b/src/cryptography/Android.bp index f1957a8ef..876fd3d48 100644 --- a/src/cryptography/Android.bp +++ b/src/cryptography/Android.bp @@ -11,6 +11,16 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_python_cryptography_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + // SPDX-license-identifier-BSD + default_applicable_licenses: ["external_python_cryptography_license"], +} + python_library { name: "py-cryptography", host_supported: true, |