aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Putikhin <nputikhin@google.com>2023-10-16 18:12:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-16 18:12:12 +0000
commit2de0948ad69dbbd73e122ae92951589cbd83e2f3 (patch)
tree60021076b23d3dd81f289691ac22895f75c6f97d
parent5ebe598b59eecdf0e92e5a0dcaaf1749b0af4b4a (diff)
parent0ff5d8830389352751725b51354602a66d21fe3f (diff)
downloadtracing-2de0948ad69dbbd73e122ae92951589cbd83e2f3.tar.gz
Add a variant with tracing macros disabled am: 697d9f61f3 am: 0ff5d88303
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tracing/+/2786222 Change-Id: I32c1d08b479cba4b8695a732e0a8e210fddae1c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp23
-rw-r--r--cargo2android.json10
2 files changed, 32 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 414bd43..e05e052 100644
--- a/Android.bp
+++ b/Android.bp
@@ -46,3 +46,26 @@ rust_library {
product_available: true,
vendor_available: true,
}
+
+rust_library {
+ name: "libtracing_max_level_off",
+ // has rustc warnings
+ host_supported: true,
+ crate_name: "tracing",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.1.37",
+ srcs: ["src/lib.rs"],
+ edition: "2018",
+ features: ["max_level_off"],
+ rustlibs: [
+ "libcfg_if",
+ "libpin_project_lite",
+ "libtracing_core",
+ ],
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ product_available: true,
+ vendor_available: true,
+}
diff --git a/cargo2android.json b/cargo2android.json
index fe43c3f..4131f2e 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,4 +1,12 @@
{
"run": true,
- "device": true
+ "device": true,
+ "variants": [
+ {
+ },
+ {
+ "features": "max_level_off",
+ "suffix": "_max_level_off"
+ }
+ ]
}