diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-21 14:51:32 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-21 14:51:32 +0000 |
commit | 084c68a3a05f04bc58e08a24ab070b0dbff95231 (patch) | |
tree | c0af63b824828d22b0fc978f526e31d2c8dc688b | |
parent | 6b9dcff686b5f367aaac114d21055a505a86d81c (diff) | |
parent | 2a836b5feeaa05a8d72b4af748b4ca1fe8e2d28d (diff) | |
download | funcsigs-android-mainline-12.0.0_r7.tar.gz |
Snap for 7478067 from 2a836b5feeaa05a8d72b4af748b4ca1fe8e2d28d to mainline-cellbroadcast-releaseandroid-mainline-12.0.0_r86android-mainline-12.0.0_r71android-mainline-12.0.0_r7android-mainline-12.0.0_r60android-mainline-12.0.0_r43android-mainline-12.0.0_r24android-mainline-12.0.0_r116android-mainline-12.0.0_r101android12-mainline-cellbroadcast-release
Change-Id: Ie7ee4b5279e023a663df94d3e0d774be9ac450c6
-rw-r--r-- | Android.bp | 30 | ||||
l--------- | NOTICE | 1 | ||||
-rw-r--r-- | TEST_MAPPING | 8 | ||||
-rw-r--r-- | funcsigs/Android.bp | 9 |
4 files changed, 39 insertions, 9 deletions
@@ -12,6 +12,36 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + default_applicable_licenses: ["external_python_funcsigs_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_funcsigs_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-PSF-2.0", + ], + license_text: [ + "LICENSE", + ], +} + python_test { name: "py2-funcsigs-tests", // use _ instead of . in the name to avoid error: @@ -1 +0,0 @@ -LICENSE
\ No newline at end of file diff --git a/TEST_MAPPING b/TEST_MAPPING deleted file mode 100644 index 61a80b2..0000000 --- a/TEST_MAPPING +++ /dev/null @@ -1,8 +0,0 @@ -{ - "presubmit" : [ - { - "name" : "acloud_test", - "host" : true - } - ] -} diff --git a/funcsigs/Android.bp b/funcsigs/Android.bp index acee033..dd3e9b6 100644 --- a/funcsigs/Android.bp +++ b/funcsigs/Android.bp @@ -12,6 +12,15 @@ // 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_funcsigs_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["external_python_funcsigs_license"], +} + python_library { name: "py-funcsigs", host_supported: true, |