diff options
| author | Andrei Homescu <ahomescu@google.com> | 2023-12-20 00:52:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-20 00:52:34 +0000 |
| commit | f5d0de6606d635e7abad616842b75e7773e01d35 (patch) | |
| tree | 3e7b2974461e5903146b23e6f172e4b22fe66afc | |
| parent | 832edf31aed8d289905b254496ea012c5a248d46 (diff) | |
| parent | d8e192848ba6ae4881953daef93c374465048e37 (diff) | |
| download | der-f5d0de6606d635e7abad616842b75e7773e01d35.tar.gz | |
Fix rules.mk and patch am: d8e192848b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/der/+/2883587
Change-Id: I15543ce956373c45777a686f4213c4c22ea7edc4
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"' \ |