Snap for 7035473 from 02d9a9abf499c32652c6f44509184116c7ed63c2 to sc-release

Change-Id: I9e6064017eb631ce250da407acd4ac0b1dc1745f
diff --git a/Android.bp b/Android.bp
index 30e65f1..370c12d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies --tests.
+// This file is generated by cargo2android.py --run --dependencies --device --tests --patch=patches/Android.bp.patch.
 
 rust_defaults {
     name: "bitflags_defaults",
@@ -8,9 +8,7 @@
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2015",
-    features: [
-        "default",
-    ],
+    features: ["default"],
     flags: [
         "--cfg bitflags_const_fn",
     ],
@@ -33,10 +31,12 @@
     crate_name: "bitflags",
     srcs: ["src/lib.rs"],
     edition: "2015",
-    features: [
-        "default",
-    ],
+    features: ["default"],
     flags: [
         "--cfg bitflags_const_fn",
     ],
+    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..580673c
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,13 @@
+diff --git a/Android.bp b/Android.bp
+index 30e65f1..3234f17 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -39,4 +39,8 @@ rust_library {
+     flags: [
+         "--cfg bitflags_const_fn",
+     ],
++    apex_available: [
++        "//apex_available:platform",
++        "com.android.virt",
++    ],
+ }