Snap for 7325276 from a614b5ee9ff937c15ed2d173a1a23724edc30574 to sc-release am: 6260744c3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/futures-executor/+/14371787
Change-Id: I155ea0fad673ac74bd118b78bd63ff8e9c24ccec
diff --git a/Android.bp b/Android.bp
index 549eb4a..f7f51d6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --dependencies --device --features=thread-pool --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 {
@@ -63,11 +63,11 @@
}
// dependent_library ["feature_list"]
-// futures-core-0.3.13 "alloc,std"
-// futures-task-0.3.13 "alloc,std"
-// futures-util-0.3.13 "alloc,slab,std"
-// libc-0.2.92 "default,std"
+// futures-core-0.3.14 "alloc,std"
+// futures-task-0.3.14 "alloc,std"
+// futures-util-0.3.14 "alloc,slab,std"
+// libc-0.2.94 "default,std"
// num_cpus-1.13.0
// pin-project-lite-0.2.6
// pin-utils-0.1.0
-// slab-0.4.2
+// slab-0.4.3 "default,std"
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..e195a6a
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,10 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "dependencies": true,
+ "device": true,
+ "features": "thread-pool",
+ "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 1911beb..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 8b0a7f0..0f6408c 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -56,6 +56,10 @@ rust_library {
- "libfutures_util",
- "libnum_cpus",
- ],
-+ apex_available: [
-+ "//apex_available:platform",
-+ "com.android.virt",
-+ ],
- }
-
- // dependent_library ["feature_list"]
