Cleanup cargo2android configs and patches am: 59a7e23856
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/clap/+/2750925
Change-Id: I01ee7b3f042ba1e141888137cdebe84daa14143b
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/3.2.23/Android.bp b/3.2.23/Android.bp
index db4e9eb..d2a25ae 100644
--- a/3.2.23/Android.bp
+++ b/3.2.23/Android.bp
@@ -58,6 +58,6 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- vendor_available: true,
product_available: true,
+ vendor_available: true,
}
diff --git a/3.2.23/cargo2android.json b/3.2.23/cargo2android.json
index f99d1f0..71f70c0 100644
--- a/3.2.23/cargo2android.json
+++ b/3.2.23/cargo2android.json
@@ -3,5 +3,9 @@
"device": true,
"features": "std",
"run": true,
- "tests": true
+ "tests": true,
+ "name-suffix": "_3.2.23",
+ "dep-suffixes": {
+ "bitflags": "-1.3.2"
+ }
}
diff --git a/3.2.23/patches/Android.bp.diff b/3.2.23/patches/Android.bp.diff
index b79bef0..c67c004 100644
--- a/3.2.23/patches/Android.bp.diff
+++ b/3.2.23/patches/Android.bp.diff
@@ -2,22 +2,14 @@
index 0593d09..0e1e5ea 100644
--- a/3.2.23/Android.bp
+++ b/3.2.23/Android.bp
-@@ -4,7 +4,7 @@
-
-
- rust_library {
-- name: "libclap",
-+ name: "libclap_3.2.23",
- host_supported: true,
- crate_name: "clap",
- cargo_env_compat: true,
-@@ -23,21 +23,3 @@ rust_library {
+@@ -23,24 +23,3 @@ rust_library {
"//apex_available:anyapex",
],
}
-
-rust_binary {
-- name: "stdio_fixture",
+- name: "stdio_fixture_3.2.23",
+- // has rustc warnings
- host_supported: true,
- crate_name: "stdio_fixture",
- cargo_env_compat: true,
@@ -26,10 +18,12 @@
- edition: "2021",
- features: ["std"],
- rustlibs: [
-- "libbitflags",
+- "libbitflags-1.3.2",
- "libclap",
- "libclap_lex",
- "libindexmap",
- "libtextwrap",
- ],
+- product_available: true,
+- vendor_available: true,
-}
diff --git a/cargo2android.json b/cargo2android.json
index e49ebf5..150a550 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -2,5 +2,8 @@
"dependencies": true,
"device": true,
"features": "derive,error-context,help,std,usage",
- "run": true
+ "run": true,
+ "dep-suffixes": {
+ "bitflags": "-1.3.2"
+ }
}
diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
deleted file mode 100644
index a4dc389..0000000
--- a/patches/Android.bp.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 235586c..1595d5e 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -53,7 +53,7 @@ rust_library {
- "usage",
- ],
- rustlibs: [
-- "libbitflags",
-+ "libbitflags-1.3.2",
- "libclap_lex",
- "libonce_cell",
- ],
-@@ -82,7 +82,7 @@ rust_binary {
- "usage",
- ],
- rustlibs: [
-- "libbitflags",
-+ "libbitflags-1.3.2",
- "libclap",
- "libclap_lex",
- "libonce_cell",
