From dc20efbfe42323a92b6028a13985334a3f2d362a Mon Sep 17 00:00:00 2001 From: Per Larsen Date: Thu, 29 Jun 2023 00:18:59 +0000 Subject: Adding autogenerated Trusty makefile rules Bug: 281857510 Change-Id: Ie05f89582003bbbbe32403fa380db3b6dcc560df --- rules.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 rules.mk diff --git a/rules.mk b/rules.mk new file mode 100644 index 0000000..ea205ae --- /dev/null +++ b/rules.mk @@ -0,0 +1,16 @@ +# This file is generated by cargo2rulesmk.py --run --features . +# Do not modify this file as changes will be overridden on upgrade. + +LOCAL_DIR := $(GET_LOCAL_DIR) +MODULE := $(LOCAL_DIR) +MODULE_CRATE_NAME := proc_macro_error_attr +MODULE_RUST_CRATE_TYPES := proc-macro +MODULE_SRCS := \ + $(LOCAL_DIR)/src/lib.rs \ + +MODULE_RUST_EDITION := 2018 +MODULE_LIBRARY_DEPS := \ + external/rust/crates/proc-macro2 \ + external/rust/crates/quote \ + +include make/library.mk -- cgit v1.2.3 From d4cc1330055ebe4894c8247ec03f548a3e2b1032 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Tue, 14 Nov 2023 18:34:54 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I06dc583eea4df2fe00d6bee90c3e21e6f18ac16d --- Android.bp | 2 +- cargo2android.json | 5 ----- cargo_embargo.json | 9 +++++++++ 3 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index 010a3be..2b49fef 100644 --- a/Android.bp +++ b/Android.bp @@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --config cargo2android.json. +// This file is generated by cargo_embargo. // Do not modify this file as changes will be overridden on upgrade. package { diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index b360f74..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "host-first-multilib": true, - "run": true, - "tests": true -} \ No newline at end of file diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..01b3445 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,9 @@ +{ + "package": { + "proc-macro-error-attr": { + "device_supported": false, + "host_first_multilib": true + } + }, + "run_cargo": false +} -- cgit v1.2.3