Generate apex_available from c2a instead of a patch am: bf8e4adbf9 am: e87e21a722 am: a908324b73 am: 24ca239b9e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/shared_child/+/1689917
Change-Id: I7eb076f9796138facd1c28bcec8cc1bc43a791c0
diff --git a/Android.bp b/Android.bp
index 010e107..72212d4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies --tests --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 {
@@ -59,4 +59,4 @@
}
// dependent_library ["feature_list"]
-// libc-0.2.93 "default,std"
+// libc-0.2.94 "default,std"
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..ac56e26
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,10 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "dependencies": true,
+ "device": true,
+ "run": true,
+ "tests": true
+}
\ No newline at end of file
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
deleted file mode 100644
index cd87fe5..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 79874d6..65f30d3 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -10,6 +10,10 @@ rust_library {
- rustlibs: [
- "liblibc",
- ],
-+ apex_available: [
-+ "//apex_available:platform",
-+ "com.android.virt",
-+ ],
- }
-
- rust_defaults {
