Snap for 7550844 from bab616e86051973fc35af8f999b41721225d2289 to mainline-conscrypt-release

Change-Id: I932d589e37d15b41f1583c0d88975e95a88621ab

Android.bp

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",
+    ],
+}

METADATA

diff --git a/METADATA b/METADATA
index 6a258aa..364b5c6 100644
--- a/METADATA
+++ b/METADATA
@@ -12,5 +12,6 @@
     value: "https://github.com/google/oauth2client"
   }
   version: "v3.0.0"
+  license_type: NOTICE
   last_upgrade_date { year: 2018 month: 6 day: 6 }
 }

NOTICE

diff --git a/NOTICE b/NOTICE
deleted file mode 120000
index 7a694c9..0000000
--- a/NOTICE
+++ /dev/null
@@ -1 +0,0 @@
-LICENSE
\ No newline at end of file

TEST_MAPPING

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
-    }
-  ]
-}

oauth2client/Android.bp

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,