Snap for 7318334 from 7728b23a4c8c9fe64126df78c24d366aad6720cb to sc-d1-release

Change-Id: Ibdf350817d6101a1fa24a8863f8c4e00590c45ac
diff --git a/Android.bp b/Android.bp
index e99d7e0..cdf2b8d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --device --run --dependencies.
+// This file is generated by cargo2android.py --device --run --dependencies --patch=patches/Android.bp.patch.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     default_applicable_licenses: ["external_rust_crates_smallvec_license"],
@@ -42,4 +43,8 @@
     crate_name: "smallvec",
     srcs: ["src/lib.rs"],
     edition: "2018",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
new file mode 100644
index 0000000..5943f32
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,13 @@
+diff --git a/Android.bp b/Android.bp
+index e99d7e0..12fdabd 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -42,4 +42,8 @@ rust_library {
+     crate_name: "smallvec",
+     srcs: ["src/lib.rs"],
+     edition: "2018",
++    apex_available: [
++        "//apex_available:platform",
++        "com.android.virt",
++    ],
+ }