Snap for 7478067 from 2599679deaeed6ce8d3dda65a8e6b800151e32c7 to mainline-ipsec-releaseandroid-mainline-12.0.0_r88android-mainline-12.0.0_r73android-mainline-12.0.0_r61android-mainline-12.0.0_r45android-mainline-12.0.0_r28android-mainline-12.0.0_r118android-mainline-12.0.0_r103android-mainline-12.0.0_r10android12-mainline-ipsec-release

Change-Id: I22647e3c2d47db45a226027b91b9df68774c7bb4

4 files changed, 41 insertions, 8 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..00d806b
--- /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_pyasn1_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "external_python_pyasn1_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD-2-Clause",
+    ],
+    license_text: [
+        "LICENSE.rst",
+    ],
+}
diff --git a/METADATA b/METADATA
index b640262..1aafab3 100644
--- a/METADATA
+++ b/METADATA
@@ -10,6 +10,7 @@ third_party {
     value: "https://github.com/etingof/pyasn1"
   }
   version: "v0.4.7"
+  license_type: NOTICE
   last_upgrade_date {
     year: 2019
     month: 9
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/pyasn1/Android.bp b/pyasn1/Android.bp
index b46e8f2..f2708be 100644
--- a/pyasn1/Android.bp
+++ b/pyasn1/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_pyasn1_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-BSD-2-Clause
+    default_applicable_licenses: ["external_python_pyasn1_license"],
+}
+
 python_library {
     name: "py-pyasn1",
     host_supported: true,