From 000e2c6c8a5952a3bfbe5986ba4d42a5fb576bde Mon Sep 17 00:00:00 2001 From: Per Larsen Date: Wed, 28 Jun 2023 03:02:38 +0000 Subject: Adding autogenerated Trusty makefile rules Bug: 281857510 Test: build.py --skip-tests qemu-generic-arm64-test-debug Change-Id: I8ec3b69e241d4e514c4f1de68134de87b95a862f --- cargo2rulesmk.json | 3 +++ patches/rules.mk.diff | 12 ++++++++++++ rules.mk | 19 +++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 cargo2rulesmk.json create mode 100644 patches/rules.mk.diff create mode 100644 rules.mk diff --git a/cargo2rulesmk.json b/cargo2rulesmk.json new file mode 100644 index 0000000..01f7467 --- /dev/null +++ b/cargo2rulesmk.json @@ -0,0 +1,3 @@ +{ + "patch": "patches/rules.mk.diff" +} diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff new file mode 100644 index 0000000..cdd223e --- /dev/null +++ b/patches/rules.mk.diff @@ -0,0 +1,12 @@ +diff --git b/rules.mk a/rules.mk +index 481dd29..329d328 100644 +--- b/rules.mk ++++ a/rules.mk +@@ -15,7 +15,5 @@ MODULE_RUSTFLAGS += \ + MODULE_LIBRARY_DEPS := \ + external/rust/crates/cfg-if \ + external/rust/crates/serde \ +- external/rust/crates/sval \ +- external/rust/crates/value-bag \ + + include make/library.mk diff --git a/rules.mk b/rules.mk new file mode 100644 index 0000000..139dca3 --- /dev/null +++ b/rules.mk @@ -0,0 +1,19 @@ +# 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) +MODULE := $(LOCAL_DIR) +MODULE_CRATE_NAME := log +MODULE_SRCS := \ + $(LOCAL_DIR)/src/lib.rs \ + +MODULE_RUST_EDITION := 2015 +MODULE_RUSTFLAGS += \ + --cfg 'atomic_cas' \ + --cfg 'has_atomics' \ + +MODULE_LIBRARY_DEPS := \ + external/rust/crates/cfg-if \ + external/rust/crates/serde \ + +include make/library.mk -- cgit v1.2.3