Snap for 7183507 from 98c808272da11f701ef3ccc42bbff79dc2a8c341 to sdk-releaseplatform-tools-31.0.2platform-tools-31.0.1

Change-Id: Ia134b5afc913e47434ad61023f2c6135197c2166

3 files changed, 56 insertions, 10 deletions

diff --git a/Android.bp b/Android.bp
index 2ce3c68..37794bc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,42 @@
-// This file is generated by cargo2android.py --device --run --dependencies.
+// This file is generated by cargo2android.py --run --dependencies --device --patch=patches/Android.bp.diff.
+
+package {
+    default_applicable_licenses: [
+        "external_rust_crates_pin-project-lite_license",
+    ],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+//
+// 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_rust_crates_pin-project-lite_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-MIT",
+    ],
+    license_text: [
+        "LICENSE-APACHE",
+        "LICENSE-MIT",
+    ],
+}
 
 rust_library {
     name: "libpin_project_lite",
@@ -6,4 +44,8 @@ rust_library {
     crate_name: "pin_project_lite",
     srcs: ["src/lib.rs"],
     edition: "2018",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index d64ac43..0000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by cargo2android.py for tests in Android.bp
-{
-  "presubmit": [
-    {
-      "host": true,
-      "name": "tokio-macros_host_test_src_lib"
-    }
-  ]
-}
diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
new file mode 100644
index 0000000..973a233
--- /dev/null
+++ b/patches/Android.bp.diff
@@ -0,0 +1,13 @@
+diff --git a/Android.bp b/Android.bp
+index 2ce3c68..c9bdf14 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -6,4 +6,8 @@ rust_library {
+     crate_name: "pin_project_lite",
+     srcs: ["src/lib.rs"],
+     edition: "2018",
++    apex_available: [
++        "//apex_available:platform",
++        "com.android.virt",
++    ],
+ }