diff options
| author | Per Larsen <perlarsen@google.com> | 2024-01-11 23:29:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-11 23:29:22 +0000 |
| commit | 0acfd68ecdaba6759dfd86d8eb9e7092faf26bec (patch) | |
| tree | 4928bc8119c8b660db5d5145a1f5f8f31f2e4aca | |
| parent | f5d0de6606d635e7abad616842b75e7773e01d35 (diff) | |
| parent | af191c320d0625f8fb41f90338fbb2e52b1a80ba (diff) | |
| download | der-0acfd68ecdaba6759dfd86d8eb9e7092faf26bec.tar.gz | |
Fix generation of Trusty makefile rules am: af191c320d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/der/+/2904248
Change-Id: Id00d7771cc6417daa29fdb75129aa35108b4676c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cargo2rulesmk.json | 3 | ||||
| -rw-r--r-- | patches/rules.mk.diff | 18 |
2 files changed, 1 insertions, 20 deletions
diff --git a/cargo2rulesmk.json b/cargo2rulesmk.json index 46cd2ac..07984ea 100644 --- a/cargo2rulesmk.json +++ b/cargo2rulesmk.json @@ -1,4 +1,3 @@ { - "features": "alloc,derive,flagset,oid,zeroize", - "patch": "patches/rules.mk.diff" + "features": "alloc,derive,flagset,oid,zeroize" } diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff deleted file mode 100644 index 58021b2..0000000 --- a/patches/rules.mk.diff +++ /dev/null @@ -1,18 +0,0 @@ -diff --git b/rules.mk a/rules.mk -index 838754b..19beb65 100644 ---- b/rules.mk -+++ a/rules.mk -@@ -18,9 +18,9 @@ MODULE_RUSTFLAGS += \ - --cfg 'feature="zeroize"' \ - - MODULE_LIBRARY_DEPS := \ -- external/rust/crates/arbitrary \ -- external/rust/crates/bytes \ -- external/rust/crates/pem-rfc7468 \ -- external/rust/crates/time \ -+ external/rust/crates/const-oid \ -+ external/rust/crates/der_derive \ -+ external/rust/crates/flagset \ -+ external/rust/crates/zeroize \ - - include make/library.mk |