diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-16 19:41:13 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 19:41:13 +0000 |
commit | 3d89df828fad9b56025f0ce3a0076031b2b2b92a (patch) | |
tree | 7ca28bee4e2cc212ca14689a20c7beda95d53d34 | |
parent | 2b6042bcc06c1f48e5e1f46b9a34720fcc088d7f (diff) | |
parent | d1cb0283118093918a821922857ba425c3fa96a4 (diff) | |
download | oauth-3d89df828fad9b56025f0ce3a0076031b2b2b92a.tar.gz |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/oauth" am: 30297abd34 am: f601b9a118 am: d1cb028311android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
Original change: https://android-review.googlesource.com/c/platform/external/oauth/+/1588996
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I817f6fd57e78d8740ad0db05c85b3397899a6113
-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"], |