diff options
| author | Andrei Homescu <ahomescu@google.com> | 2023-12-20 01:55:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-20 01:55:35 +0000 |
| commit | 0d7ad0bf3e493c964e85b572d5493d1f7b774e5a (patch) | |
| tree | 3e7b2974461e5903146b23e6f172e4b22fe66afc | |
| parent | ca49e4f99c5539a877d171ee903f4ebfb56cc1bd (diff) | |
| parent | 1c7378c53824427f7d6efda402747886a05c61dc (diff) | |
| download | der-0d7ad0bf3e493c964e85b572d5493d1f7b774e5a.tar.gz | |
Fix rules.mk and patch am: d8e192848b am: f5d0de6606 am: 1c7378c538
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/der/+/2883587
Change-Id: I72bdbec863bb259df10bb6e99ecb5f9b416b7287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | patches/rules.mk.diff | 4 | ||||
| -rw-r--r-- | rules.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff index 3c0a6f6..58021b2 100644 --- a/patches/rules.mk.diff +++ b/patches/rules.mk.diff @@ -2,10 +2,12 @@ diff --git b/rules.mk a/rules.mk index 838754b..19beb65 100644 --- b/rules.mk +++ a/rules.mk -@@ -18,7 +18,9 @@ MODULE_RUSTFLAGS += \ +@@ -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 \ @@ -1,4 +1,4 @@ -# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json --features . +# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json. # Do not modify this file as changes will be overridden on upgrade. LOCAL_DIR := $(GET_LOCAL_DIR) @@ -10,8 +10,6 @@ MODULE_SRCS := \ MODULE_RUST_EDITION := 2021 MODULE_RUSTFLAGS += \ --cfg 'feature="alloc"' \ - --cfg 'feature="const-oid"' \ - --cfg 'feature="der_derive"' \ --cfg 'feature="derive"' \ --cfg 'feature="flagset"' \ --cfg 'feature="oid"' \ |