diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-21 14:30:20 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-21 14:30:20 +0000 |
commit | aeec67d49fb799cf0c3a496facf8f6caf9a60524 (patch) | |
tree | ee2d0182d9611b11c7d1e2229bce499e812480f3 | |
parent | a0c2438c7a883c23642177532ad8228d7b666de4 (diff) | |
parent | 9f0bad686d0e7517a28c3992cd768f9111ff276f (diff) | |
download | cffi-aeec67d49fb799cf0c3a496facf8f6caf9a60524.tar.gz |
Snap for 7478028 from 9f0bad686d0e7517a28c3992cd768f9111ff276f to mainline-documentsui-releaseandroid-mainline-12.0.0_r26android-mainline-12.0.0_r2aml_doc_310851020android12-mainline-documentsui-release
Change-Id: Ia00d159784e2aa7736c75004f866b01d5d7275d4
-rw-r--r-- | Android.bp | 31 | ||||
l--------- | NOTICE | 1 | ||||
-rw-r--r-- | TEST_MAPPING | 8 | ||||
-rw-r--r-- | c/Android.bp | 11 | ||||
-rw-r--r-- | cffi/Android.bp | 9 |
5 files changed, 49 insertions, 11 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..13f23dd --- /dev/null +++ b/Android.bp @@ -0,0 +1,31 @@ +// +// 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_cffi_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "external_python_cffi_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-MIT", + ], + license_text: [ + "LICENSE", + ], +} @@ -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/c/Android.bp b/c/Android.bp index baced02..7ddc006 100644 --- a/c/Android.bp +++ b/c/Android.bp @@ -1,3 +1,12 @@ +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_cffi_license" + // to get the below license kinds: + // SPDX-license-identifier-MIT + default_applicable_licenses: ["external_python_cffi_license"], +} + python_library { name: "py-cffi-backend", host_supported: true, @@ -49,5 +58,3 @@ filegroup { ".libs_cffi_backend/libffi-45372312.so.6.0.4", ], } - - diff --git a/cffi/Android.bp b/cffi/Android.bp index e25787e..c600087 100644 --- a/cffi/Android.bp +++ b/cffi/Android.bp @@ -11,6 +11,15 @@ // 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_cffi_license" + // to get the below license kinds: + // SPDX-license-identifier-MIT + default_applicable_licenses: ["external_python_cffi_license"], +} + python_library { name: "py-cffi", host_supported: true, |