Snap for 7550930 from a724bdac2f92c072fef13b2caa67b5d747df33e7 to mainline-captiveportallogin-releaseandroid-mainline-12.0.0_r6android-mainline-12.0.0_r23android12-mainline-captiveportallogin-release

Change-Id: Ic8144346dbebc3ae14e1f9253532413a311eb5cd

4 files changed, 49 insertions, 9 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..9d4bf6d
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,39 @@
+//
+// 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_uritemplates_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_python_uritemplates_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "LICENSE",
+        "LICENSE.APACHE",
+        "LICENSE.BSD",
+        "NOTICE",
+    ],
+}
diff --git a/METADATA b/METADATA
index b41e13f..dddab8c 100644
--- a/METADATA
+++ b/METADATA
@@ -10,6 +10,7 @@ third_party {
     value: "https://github.com/python-hyper/uritemplate"
   }
   version: "3.0.1"
+  license_type: NOTICE
   last_upgrade_date {
     year: 2019
     month: 12
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/uritemplate/Android.bp b/uritemplate/Android.bp
index 706dba5..068c029 100644
--- a/uritemplate/Android.bp
+++ b/uritemplate/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_uritemplates_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_python_uritemplates_license"],
+}
+
 python_library {
     name: "py-uritemplate",
     host_supported: true,
@@ -27,4 +36,3 @@ python_library {
     },
     pkg_path: "uritemplate",
 }
-