Snap for 7325276 from 61b74c4fa0c3e1ac07e84018dc49303cf999fbc4 to sc-release
Change-Id: I63626d22742e58fb736d3cc2ec534174361e0952
diff --git a/Android.bp b/Android.bp
index 03f16a5..50fe7cb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies --patch=patches/Android.bp.patch.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -41,4 +41,4 @@
// dependent_library ["feature_list"]
// bitflags-1.2.1 "default"
// cfg-if-1.0.0
-// libc-0.2.92 "default,extra_traits,std"
+// libc-0.2.94 "default,extra_traits,std"
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..42b7833
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,9 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "dependencies": true,
+ "device": true,
+ "run": true
+}
\ No newline at end of file
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
deleted file mode 100644
index 525dd17..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index a84b87c..d1c7d5b 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -13,6 +13,10 @@ rust_library {
- "libcfg_if",
- "liblibc",
- ],
-+ apex_available: [
-+ "//apex_available:platform",
-+ "com.android.virt",
-+ ],
- }
-
- // dependent_library ["feature_list"]
