diff options
| author | Orlando Arbildo <oarbildo@google.com> | 2024-01-27 00:36:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-27 00:36:59 +0000 |
| commit | 83d827b0fb3a603402222969d4e3ee00d5d701a4 (patch) | |
| tree | 8d6528971a1550277f56a52303d1ccef11699312 | |
| parent | 887058eddfce42f3a3a7ad2f05eea578a8ac5645 (diff) | |
| parent | e9a44b53e191ea7061edcb2fecdef17072aaeceb (diff) | |
| download | libc-83d827b0fb3a603402222969d4e3ee00d5d701a4.tar.gz | |
updating rules.mk.diff am: e9a44b53e1
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libc/+/2928747
Change-Id: Ia39c2074dc598be09f5c8b71142f42189ee614bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | patches/rules.mk.diff | 10 | ||||
| -rw-r--r-- | rules.mk | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff index c3310b80..bad06a22 100644 --- a/patches/rules.mk.diff +++ b/patches/rules.mk.diff @@ -2,16 +2,14 @@ diff --git a/rules.mk b/rules.mk index 92f34db68..08cf2d6c3 100644 --- a/rules.mk +++ b/rules.mk -@@ -24,8 +24,12 @@ MODULE_RUSTFLAGS += \ +@@ -24,5 +24,11 @@ --cfg 'libc_ptr_addr_of' \ --cfg 'libc_underscore_const_names' \ --cfg 'libc_union' \ + -A unknown-lints \ - - MODULE_LIBRARY_DEPS := \ - external/rust/crates/rustc-std-workspace-core \ ++ ++MODULE_LIBRARY_DEPS := \ + trusty/user/base/lib/libcompiler_builtins-rust \ + trusty/user/base/lib/libcore-rust \ + trusty/user/base/lib/libc-trusty \ - - include make/library.mk + @@ -1,4 +1,4 @@ -# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json. +# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json --features .. # Do not modify this file as changes will be overridden on upgrade. LOCAL_DIR := $(GET_LOCAL_DIR) @@ -27,7 +27,6 @@ MODULE_RUSTFLAGS += \ -A unknown-lints \ MODULE_LIBRARY_DEPS := \ - external/rust/crates/rustc-std-workspace-core \ trusty/user/base/lib/libcompiler_builtins-rust \ trusty/user/base/lib/libcore-rust \ trusty/user/base/lib/libc-trusty \ |