diff options
author | Andrew Walbran <qwandor@google.com> | 2023-12-06 18:41:33 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-06 18:41:33 +0000 |
commit | 8fcda063c0567e407cfc104b8a7419e8263efd84 (patch) | |
tree | 841d7c9a7aa7b7fafde312627b88fc6d691b713d | |
parent | 2571fec011cd8d62e31c3db14bcec1992ff779e8 (diff) | |
parent | 319eff57c023c8f856c797ca70a46e830a735111 (diff) | |
download | clap-8fcda063c0567e407cfc104b8a7419e8263efd84.tar.gz |
Migrate to cargo_embargo. am: deac707af7 am: 319eff57c0
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/clap/+/2859887
Change-Id: I206a980b1c3763fb2215079fee0a20fcdfe10044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | 3.2.23/Android.bp | 4 | ||||
-rw-r--r-- | 3.2.23/cargo2android.json | 11 | ||||
-rw-r--r-- | 3.2.23/cargo_embargo.json | 13 | ||||
-rw-r--r-- | 3.2.23/patches/Android.bp.diff | 29 |
4 files changed, 14 insertions, 43 deletions
diff --git a/3.2.23/Android.bp b/3.2.23/Android.bp index d2a25ae..3acde9b 100644 --- a/3.2.23/Android.bp +++ b/3.2.23/Android.bp @@ -1,8 +1,6 @@ -// This file is generated by cargo2android.py --config cargo2android.json. +// This file is generated by cargo_embargo. // Do not modify this file as changes will be overridden on upgrade. - - package { default_applicable_licenses: ["external_rust_crates_clap_3.2.23_license"], } diff --git a/3.2.23/cargo2android.json b/3.2.23/cargo2android.json deleted file mode 100644 index 71f70c0..0000000 --- a/3.2.23/cargo2android.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "patch": "patches/Android.bp.diff", - "device": true, - "features": "std", - "run": true, - "tests": true, - "name-suffix": "_3.2.23", - "dep-suffixes": { - "bitflags": "-1.3.2" - } -} diff --git a/3.2.23/cargo_embargo.json b/3.2.23/cargo_embargo.json new file mode 100644 index 0000000..d067cdc --- /dev/null +++ b/3.2.23/cargo_embargo.json @@ -0,0 +1,13 @@ +{ + "features": [ + "std" + ], + "module_blocklist": [ + "stdio_fixture" + ], + "module_name_overrides": { + "libbitflags": "libbitflags-1.3.2", + "libclap": "libclap_3.2.23" + }, + "run_cargo": false +} diff --git a/3.2.23/patches/Android.bp.diff b/3.2.23/patches/Android.bp.diff deleted file mode 100644 index c67c004..0000000 --- a/3.2.23/patches/Android.bp.diff +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/3.2.23/Android.bp b/3.2.23/Android.bp -index 0593d09..0e1e5ea 100644 ---- a/3.2.23/Android.bp -+++ b/3.2.23/Android.bp -@@ -23,24 +23,3 @@ rust_library { - "//apex_available:anyapex", - ], - } -- --rust_binary { -- name: "stdio_fixture_3.2.23", -- // has rustc warnings -- host_supported: true, -- crate_name: "stdio_fixture", -- cargo_env_compat: true, -- cargo_pkg_version: "3.2.23", -- srcs: ["src/bin/stdio-fixture.rs"], -- edition: "2021", -- features: ["std"], -- rustlibs: [ -- "libbitflags-1.3.2", -- "libclap", -- "libclap_lex", -- "libindexmap", -- "libtextwrap", -- ], -- product_available: true, -- vendor_available: true, --} |