diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-11 21:41:16 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-11 21:41:16 +0000 |
commit | 601a39ef6e249a034ee9b4175eadad863fd5a1ae (patch) | |
tree | 06de542d3b3e4898e3ff1aa4d600c72498ed8e06 | |
parent | 7d321ef4425912debf774dff22347259a102d6fe (diff) | |
parent | 565785578736a4766a9668a83bd02ef5aae63b44 (diff) | |
download | bitflags-601a39ef6e249a034ee9b4175eadad863fd5a1ae.tar.gz |
Snap for 11077682 from 565785578736a4766a9668a83bd02ef5aae63b44 to emu-34-release
Change-Id: I73b1db51d9642ba10788d90737a338746541acf3
-rw-r--r-- | 1.3.2/rules.mk | 19 | ||||
-rw-r--r-- | cargo2rulesmk.json | 3 | ||||
-rw-r--r-- | patches/rules.mk.diff | 13 | ||||
-rw-r--r-- | rules.mk | 16 |
4 files changed, 51 insertions, 0 deletions
diff --git a/1.3.2/rules.mk b/1.3.2/rules.mk new file mode 100644 index 0000000..606f681 --- /dev/null +++ b/1.3.2/rules.mk @@ -0,0 +1,19 @@ +# This file was generated by cargo2rulesmk.py --run. + +LOCAL_DIR := $(GET_LOCAL_DIR) +MODULE := $(LOCAL_DIR) +MODULE_CRATE_NAME := bitflags +MODULE_SRCS := \ + $(LOCAL_DIR)/src/lib.rs \ + +MODULE_RUST_STEM := bitflags_1.3.2 + +MODULE_RUST_EDITION := 2018 +MODULE_RUSTFLAGS += \ + --cfg 'feature="default"' \ + +MODULE_LIBRARY_DEPS := \ + trusty/user/base/lib/libcompiler_builtins-rust \ + trusty/user/base/lib/libcore-rust \ + +include make/library.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..05c3bef --- /dev/null +++ b/patches/rules.mk.diff @@ -0,0 +1,13 @@ +diff --git b/rules.mk a/rules.mk +index ccb9711..8005071 100644 +--- b/rules.mk ++++ a/rules.mk +@@ -9,8 +9,6 @@ MODULE_SRCS := \ + + MODULE_RUST_EDITION := 2021 + MODULE_LIBRARY_DEPS := \ +- external/rust/crates/arbitrary \ +- external/rust/crates/bytemuck \ + trusty/user/base/lib/libcompiler_builtins-rust \ + trusty/user/base/lib/libcore-rust \ + external/rust/crates/serde \ diff --git a/rules.mk b/rules.mk new file mode 100644 index 0000000..8005071 --- /dev/null +++ b/rules.mk @@ -0,0 +1,16 @@ +# 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) +MODULE := $(LOCAL_DIR) +MODULE_CRATE_NAME := bitflags +MODULE_SRCS := \ + $(LOCAL_DIR)/src/lib.rs \ + +MODULE_RUST_EDITION := 2021 +MODULE_LIBRARY_DEPS := \ + trusty/user/base/lib/libcompiler_builtins-rust \ + trusty/user/base/lib/libcore-rust \ + external/rust/crates/serde \ + +include make/library.mk |