diff options
| author | Per Larsen <perlarsen@google.com> | 2024-01-05 03:28:13 +0000 |
|---|---|---|
| committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2024-01-10 23:53:20 +0000 |
| commit | af191c320d0625f8fb41f90338fbb2e52b1a80ba (patch) | |
| tree | 4928bc8119c8b660db5d5145a1f5f8f31f2e4aca | |
| parent | d8e192848ba6ae4881953daef93c374465048e37 (diff) | |
| download | der-af191c320d0625f8fb41f90338fbb2e52b1a80ba.tar.gz | |
Fix generation of Trusty makefile rules
Thanks to improvements in cargo2rulesmk.py, the patch file is no
longer necessary and no longer apply correctly.
Bug: None
(cherry picked from https://android-review.googlesource.com/q/commit:74b88561e828e22463b908f7ce5db9dc97cc4833)
Merged-In: I5c3a7ad65ed10b06ec82d69bf6fa8672cf269c09
Change-Id: I5c3a7ad65ed10b06ec82d69bf6fa8672cf269c09
| -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 |