diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-16 18:18:33 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 18:18:33 +0000 |
commit | f601b9a1183ad5bd14962b3ccd88f1a530481834 (patch) | |
tree | 7ca28bee4e2cc212ca14689a20c7beda95d53d34 | |
parent | 64953710f9c9c7b4c9fa9af8fbdabdf4b8e23e13 (diff) | |
parent | 30297abd34ee01f7f7618ae08f8940e58d542ce9 (diff) | |
download | oauth-f601b9a1183ad5bd14962b3ccd88f1a530481834.tar.gz |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/oauth" am: 30297abd34android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4
Original change: https://android-review.googlesource.com/c/platform/external/oauth/+/1588996
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I05035afebc4aa7e108728e549f5a1eeacbf53913
-rw-r--r-- | Android.bp | 37 | ||||
-rw-r--r-- | core/src/main/java/Android.bp | 9 |
2 files changed, 46 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..6b1501f --- /dev/null +++ b/Android.bp @@ -0,0 +1,37 @@ +// +// 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_oauth_license"], +} + +// Added automatically by a large-scale-change +// +// 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_oauth_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "LICENSE.txt", + "NOTICE", + ], +} diff --git a/core/src/main/java/Android.bp b/core/src/main/java/Android.bp index 412ca6e..6c9b39a 100644 --- a/core/src/main/java/Android.bp +++ b/core/src/main/java/Android.bp @@ -1,4 +1,13 @@ // Build the client static library for the Google Services Framework +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_oauth_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["external_oauth_license"], +} + java_library { name: "oauth", srcs: ["net/**/*.java"], |