diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-22 21:39:50 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-22 21:39:50 +0000 |
| commit | c9d575fda34bd117f67fa38a2a392fb5786a11c3 (patch) | |
| tree | 8c09d231746162810f31022c7191b09e32fc7856 | |
| parent | b50f0258e8c7424333d020c4d308fb6111e4dccd (diff) | |
| parent | a28a75e883a06f4d384b555e6a6f9c73bb8e875a (diff) | |
| download | bitflags-c9d575fda34bd117f67fa38a2a392fb5786a11c3.tar.gz | |
Snap for 11135399 from a28a75e883a06f4d384b555e6a6f9c73bb8e875a to simpleperf-release
Change-Id: I11dbd7d2406ab53426832f534f551ec94e671bac
| -rw-r--r-- | 1.3.2/rules.mk | 19 | ||||
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | cargo2android.json | 8 | ||||
| -rw-r--r-- | cargo2rulesmk.json | 3 | ||||
| -rw-r--r-- | cargo_embargo.json | 11 | ||||
| -rw-r--r-- | patches/rules.mk.diff | 13 | ||||
| -rw-r--r-- | rules.mk | 16 |
7 files changed, 63 insertions, 9 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 @@ -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 bc0ef74..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependency-blocklist": [ - "trybuild" - ], - "device": true, - "min-sdk-version": "29", - "run": true -} 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/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..9ce3b17 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,11 @@ +{ + "min_sdk_version": "29", + "package": { + "bitflags": { + "dep_blocklist": [ + "libtrybuild" + ] + } + }, + "run_cargo": false +} 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 |