diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-17 19:02:59 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-17 19:02:59 +0000 |
commit | 05a7b9797f58dbbdbb272aa7cb876c908790cc84 (patch) | |
tree | 6c2abc200c227597d4fac93edaea6674cfb41673 | |
parent | bc5b71ea687cbe1a5675215e617d1f4b310cc4e5 (diff) | |
parent | 52970ac9f9205854557467c1f6da5347cea629e3 (diff) | |
download | six-android12-mainline-mediaprovider-release.tar.gz |
Snap for 7468467 from 52970ac9f9205854557467c1f6da5347cea629e3 to mainline-mediaprovider-releaseandroid-mainline-12.0.0_r90android-mainline-12.0.0_r76android-mainline-12.0.0_r48android-mainline-12.0.0_r31android-mainline-12.0.0_r121android-mainline-12.0.0_r11android-mainline-12.0.0_r106aml_mpr_311911090android12-mainline-mediaprovider-release
Change-Id: I87fab4bbd729b01c06fcd7c995762a05f5504e62
-rw-r--r-- | Android.bp | 17 | ||||
-rw-r--r-- | METADATA | 1 | ||||
-rw-r--r-- | NOTICE | 18 | ||||
-rw-r--r-- | TEST_MAPPING | 8 |
4 files changed, 18 insertions, 26 deletions
@@ -12,6 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + default_applicable_licenses: ["external_python_six_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "external_python_six_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-MIT", + ], + license_text: [ + "LICENSE", + ], +} + python_library { name: "py-six", host_supported: true, @@ -12,5 +12,6 @@ third_party { value: "https://github.com/benjaminp/six" } version: "1.11.0" + license_type: NOTICE last_upgrade_date { year: 2018 month: 1 day: 4 } } @@ -1,18 +0,0 @@ -Copyright (c) 2010-2017 Benjamin Peterson - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 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 - } - ] -} |