diff options
author | Andrew Walbran <qwandor@google.com> | 2023-10-23 14:23:32 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-23 14:23:32 +0000 |
commit | a800f831a028a395b6d87633762ac07f9dab52fb (patch) | |
tree | 954b7dc4392af7ae5e358ebb1836425b0c1560d0 | |
parent | 5e54405867079255e33d8db6db45138197e81028 (diff) | |
parent | 310aad08ebd59e33f831ba7ec5ff62f86a0627ca (diff) | |
download | android_logger-a800f831a028a395b6d87633762ac07f9dab52fb.tar.gz |
Migrate to cargo_embargo. am: 5dca274d04 am: ab8bc93c6c am: 310aad08eb
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/android_logger/+/2796123
Change-Id: I755cb9d56a794175495da0e9e614872992971808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 51 | ||||
-rw-r--r-- | cargo2android.json | 13 | ||||
-rw-r--r-- | cargo_embargo.json | 10 |
3 files changed, 49 insertions, 25 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 { @@ -60,11 +60,12 @@ rust_test { ], } -rust_defaults { - name: "android_logger_test_defaults", - crate_name: "android_logger", +rust_test { + name: "android_logger_test_tests_config_log_level", + crate_name: "config_log_level", cargo_env_compat: true, cargo_pkg_version: "0.12.0", + srcs: ["tests/config_log_level.rs"], test_suites: ["general-tests"], auto_gen_config: true, edition: "2015", @@ -82,21 +83,47 @@ rust_defaults { } rust_test { - name: "android_logger_test_tests_config_log_level", - defaults: ["android_logger_test_defaults"], - srcs: ["tests/config_log_level.rs"], -} - -rust_test { name: "android_logger_test_tests_default_init", - defaults: ["android_logger_test_defaults"], + crate_name: "default_init", + cargo_env_compat: true, + cargo_pkg_version: "0.12.0", srcs: ["tests/default_init.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, + edition: "2015", + features: [ + "default", + "regex", + ], + rustlibs: [ + "libandroid_log_sys", + "libandroid_logger", + "libenv_logger", + "liblog_rust", + "libonce_cell", + ], } rust_test { name: "android_logger_test_tests_multiple_init", - defaults: ["android_logger_test_defaults"], + crate_name: "multiple_init", + cargo_env_compat: true, + cargo_pkg_version: "0.12.0", srcs: ["tests/multiple_init.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, + edition: "2015", + features: [ + "default", + "regex", + ], + rustlibs: [ + "libandroid_log_sys", + "libandroid_logger", + "libenv_logger", + "liblog_rust", + "libonce_cell", + ], } rust_library { diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 2733be4..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "//apex_available:anyapex" - ], - "dependencies": true, - "device": true, - "min-sdk-version": "29", - "no-host": true, - "run": true, - "tests": true, - "vendor-available": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..d62da6a --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,10 @@ +{ + "tests": true, + "min_sdk_version": "29", + "package": { + "android_logger": { + "host_supported": false + } + }, + "run_cargo": false +} |