diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 01:36:03 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 01:36:03 +0000 |
commit | 1026f6741fbac191cda2e7f014995b36eb713b24 (patch) | |
tree | 02b48942983026efaa429875f2dba10e6c88dd32 | |
parent | 48bbe85f5376bdd485cbe92d8abea459c31d6034 (diff) | |
parent | bab616e86051973fc35af8f999b41721225d2289 (diff) | |
download | oauth2client-android-mainline-12.0.0_r18.tar.gz |
Snap for 7550844 from bab616e86051973fc35af8f999b41721225d2289 to mainline-tethering-releaseandroid-mainline-12.0.0_r95android-mainline-12.0.0_r82android-mainline-12.0.0_r66android-mainline-12.0.0_r53android-mainline-12.0.0_r38android-mainline-12.0.0_r18android-mainline-12.0.0_r125android-mainline-12.0.0_r110aml_tet_311811050android12-mainline-tethering-release
Change-Id: I926e8866eddede3bd998a45a063f3093dc61d8a6
-rw-r--r-- | Android.bp | 31 | ||||
-rw-r--r-- | METADATA | 1 | ||||
l--------- | NOTICE | 1 | ||||
-rw-r--r-- | TEST_MAPPING | 8 | ||||
-rw-r--r-- | oauth2client/Android.bp | 9 |
5 files changed, 41 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..ab967f8 --- /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_oauth2client_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "external_python_oauth2client_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "LICENSE", + ], +} @@ -12,5 +12,6 @@ third_party { value: "https://github.com/google/oauth2client" } version: "v3.0.0" + license_type: NOTICE last_upgrade_date { year: 2018 month: 6 day: 6 } } @@ -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/oauth2client/Android.bp b/oauth2client/Android.bp index 7818920..0faa5c5 100644 --- a/oauth2client/Android.bp +++ b/oauth2client/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_oauth2client_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["external_python_oauth2client_license"], +} + python_library { name: "py-oauth2client", host_supported: true, |