diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-01 11:02:49 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-01 11:02:49 +0000 |
| commit | fb5b2a29def6dd279185d162e38354fceca4128b (patch) | |
| tree | c4117cdc5b180b134551b48db43848333b3254e5 | |
| parent | a7d552bbccab44150acc761340187c2200f5662d (diff) | |
| parent | d41a583bdf31ca0688f1126a96636602a37b7f38 (diff) | |
| download | structopt-derive-sdk-release.tar.gz | |
Snap for 9550355 from d41a583bdf31ca0688f1126a96636602a37b7f38 to sdk-releaseplatform-tools-34.0.1platform-tools-34.0.0platform-tools-33.0.4sdk-releasebusytown-mac-infra-release
Change-Id: I3bd58451c910e2507d8bfbb8444356bbcc5b0197
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | TEST_MAPPING | 10 | ||||
| -rw-r--r-- | cargo2android.json | 4 | ||||
| -rw-r--r-- | patches/0001-Use-heck-0.3.3.patch | 30 |
4 files changed, 33 insertions, 13 deletions
@@ -47,7 +47,7 @@ rust_proc_macro { srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ - "libheck", + "libheck_deprecated", "libproc_macro2", "libproc_macro_error", "libquote", diff --git a/TEST_MAPPING b/TEST_MAPPING index 8029a19..99dd03b 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -4,15 +4,5 @@ { "path": "external/rust/crates/base64" } - ], - "presubmit": [ - { - "name": "authfs_device_test_src_lib" - } - ], - "presubmit-rust": [ - { - "name": "authfs_device_test_src_lib" - } ] } diff --git a/cargo2android.json b/cargo2android.json index 341300b..8c8d4d2 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,4 +1,4 @@ { "run": true, - "tests": true -}
\ No newline at end of file + "patch": "patches/0001-Use-heck-0.3.3.patch" +} diff --git a/patches/0001-Use-heck-0.3.3.patch b/patches/0001-Use-heck-0.3.3.patch new file mode 100644 index 0000000..723e6bd --- /dev/null +++ b/patches/0001-Use-heck-0.3.3.patch @@ -0,0 +1,30 @@ +From bde791c5d4b5744bf060152e37fea18dfc5556ce Mon Sep 17 00:00:00 2001 +From: Matthew Maurer <mmaurer@google.com> +Date: Wed, 7 Sep 2022 16:35:34 -0700 +Subject: [PATCH] Use heck-0.3.3 + +Structopt is EOL and will not update to 0.4 +The plan for migrating off is to delete structopt after migrating +clients to clap + clap-derive + +Change-Id: I091b43aa4200873119af990be9a5d6dd6907a40b +--- + Android.bp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Android.bp b/Android.bp +index e008611..9e35e36 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -47,7 +47,7 @@ rust_proc_macro { + srcs: ["src/lib.rs"], + edition: "2018", + rustlibs: [ +- "libheck", ++ "libheck_deprecated", + "libproc_macro2", + "libproc_macro_error", + "libquote", +-- +2.37.2.789.g6183377224-goog + |