Generate apex_available from c2a instead of a patch am: 1a7271af62 am: 2985289ffb am: f4a1f02f91 am: 4eafa0cc0e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pin-project/+/1688682
Change-Id: I2f6bd9cfd42b823b7e0bd1f9c67592f21fd2293d
diff --git a/Android.bp b/Android.bp
index d3b5aa9..068bed6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --dependencies --device --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 {
@@ -54,5 +54,5 @@
// pin-project-internal-1.0.6
// proc-macro2-1.0.26 "default,proc-macro"
// quote-1.0.9 "default,proc-macro"
-// syn-1.0.68 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+// syn-1.0.71 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
// unicode-xid-0.2.1 "default"
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 e0adcd4..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 1ed91d5..16df3fc 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -7,6 +7,10 @@ rust_library {
- srcs: ["src/lib.rs"],
- edition: "2018",
- proc_macros: ["libpin_project_internal"],
-+ apex_available: [
-+ "//apex_available:platform",
-+ "com.android.virt",
-+ ],
- }
-
- // dependent_library ["feature_list"]
