diff options
| author | Matthew Maurer <mmaurer@google.com> | 2021-08-23 20:01:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-23 20:01:13 +0000 |
| commit | a719259c72d752f588b141043d838bdc928b5c54 (patch) | |
| tree | 5f5065ae386a717e6380711b684df29ecabc46d9 | |
| parent | 333c830c5efe18c595677831e5fe0a5d3a897089 (diff) | |
| parent | 7c62370957e890e28f06bf2d2594adbc0e75c2e2 (diff) | |
| download | rustc-demangle-capi-a719259c72d752f588b141043d838bdc928b5c54.tar.gz | |
Suppress cdylib build am: b5b10ef8fe am: 7c62370957
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-demangle-capi/+/1798340
Change-Id: Ief6421da106fc4ccc2c3951ca17a9a545dca1529
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | patches/0001-Suppress-cdylib-build.patch | 30 |
2 files changed, 31 insertions, 1 deletions
@@ -20,6 +20,6 @@ repository = "https://github.com/alexcrichton/rustc-demangle" [lib] name = "rustc_demangle" -crate-type = ["staticlib", "cdylib"] +crate-type = ["staticlib"] [dependencies.rustc-demangle] version = "0.1.16" diff --git a/patches/0001-Suppress-cdylib-build.patch b/patches/0001-Suppress-cdylib-build.patch new file mode 100644 index 0000000..2524040 --- /dev/null +++ b/patches/0001-Suppress-cdylib-build.patch @@ -0,0 +1,30 @@ +From 8106a52ecca371216903fb7b5077409ee1d31ee0 Mon Sep 17 00:00:00 2001 +From: Matthew Maurer <mmaurer@google.com> +Date: Mon, 16 Aug 2021 14:05:54 -0700 +Subject: [PATCH] Suppress cdylib build + +Currently, cdylibs aren't allowed in certain contexts until support for +vendor snapshots is added. Since rustc-demangle-capi is needed in those +environments, we prevent cdylib from being generated during the +cargo2android scan. + +Change-Id: I1deb453a8095bc69f963e765b28333752ec483ff +--- + Cargo.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Cargo.toml b/Cargo.toml +index 5828d25..9ab660e 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -20,6 +20,6 @@ repository = "https://github.com/alexcrichton/rustc-demangle" + + [lib] + name = "rustc_demangle" +-crate-type = ["staticlib", "cdylib"] ++crate-type = ["staticlib"] + [dependencies.rustc-demangle] + version = "0.1.16" +-- +2.33.0.rc1.237.g0d66db33f3-goog + |