Generate apex_available from c2a instead of a patch am: a4c43fafd2 am: d1bb8b6b84 am: 3d54d6c5d6
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt/+/1689919
Change-Id: Ic378b1094830f1705e41f8bde17992f6e73df703
diff --git a/Android.bp b/Android.bp
index fbe6dce..9905be3 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 {
@@ -62,17 +62,17 @@
// clap-2.33.3 "ansi_term,atty,color,default,strsim,suggestions,vec_map"
// heck-0.3.2
// lazy_static-1.4.0
-// libc-0.2.88
+// libc-0.2.94
// proc-macro-error-1.0.4 "default,syn,syn-error"
// proc-macro-error-attr-1.0.4
-// proc-macro2-1.0.24 "default,proc-macro"
+// proc-macro2-1.0.26 "default,proc-macro"
// quote-1.0.9 "default,proc-macro"
// strsim-0.8.0
// structopt-derive-0.4.14
-// syn-1.0.63 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote"
+// syn-1.0.71 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote"
// textwrap-0.11.0
// unicode-segmentation-1.7.1
// unicode-width-0.1.8 "default"
// unicode-xid-0.2.1 "default"
// vec_map-0.8.2
-// version_check-0.9.2
+// version_check-0.9.3
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 979197c..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 2695275..01ae097 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -13,6 +13,10 @@ rust_library {
- "liblazy_static",
- ],
- proc_macros: ["libstructopt_derive"],
-+ apex_available: [
-+ "//apex_available:platform",
-+ "com.android.virt",
-+ ],
- }
-
- // dependent_library ["feature_list"]
