diff options
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | cargo2android.json | 12 | ||||
| -rw-r--r-- | cargo2rulesmk.json | 4 | ||||
| -rw-r--r-- | cargo_embargo.json | 5 | ||||
| -rw-r--r-- | rules.mk | 19 |
5 files changed, 30 insertions, 16 deletions
@@ -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 { @@ -65,9 +65,7 @@ rust_test { unit_test: true, }, edition: "2018", - rustlibs: [ - "libcfg_if", - ], + rustlibs: ["libcfg_if"], } rust_library { diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index c789f3b..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "//apex_available:anyapex" - ], - "dependencies": true, - "device": true, - "min-sdk-version": "29", - "run": true, - "tests": true, - "vendor-available": true -} diff --git a/cargo2rulesmk.json b/cargo2rulesmk.json new file mode 100644 index 0000000..6c03ee1 --- /dev/null +++ b/cargo2rulesmk.json @@ -0,0 +1,4 @@ +{ + "module_add_implicit_deps": false, + "module_add_implicit_deps_reason": "# NOTE: This crate is a dependency of libstd, so we can't implicitly depend on\n# libstd as we would normally. The dependencies listed above are the ones\n# declared in the `Cargo.toml` when the `rustc-dep-of-std` feature is enabled." +}
\ No newline at end of file diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..16616e0 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,5 @@ +{ + "min_sdk_version": "29", + "run_cargo": false, + "tests": true +} diff --git a/rules.mk b/rules.mk new file mode 100644 index 0000000..05bd4dd --- /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 := cfg_if +MODULE_SRCS := \ + $(LOCAL_DIR)/src/lib.rs \ + +# NOTE: This crate is a dependency of libstd, so we can't implicitly depend on +# libstd as we would normally. The dependencies listed above are the ones +# declared in the `Cargo.toml` when the `rustc-dep-of-std` feature is enabled. +MODULE_ADD_IMPLICIT_DEPS := false +MODULE_RUST_EDITION := 2018 +MODULE_LIBRARY_DEPS := \ + trusty/user/base/lib/libcompiler_builtins-rust \ + trusty/user/base/lib/libcore-rust \ + +include make/library.mk |