aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Radomski <dextero@google.com>2024-02-08 17:49:07 +0000
committerMarcin Radomski <dextero@google.com>2024-02-08 18:10:29 +0000
commit7e72144c6807c9e0b2720f7d3cfe86e52a4d858a (patch)
treeb7c29c6175b6b8e6aa29a7b7e850d32eeeaabf7f
parent4647cbe7f8a1568d3cc82a43c97d23069abb3f72 (diff)
downloadtracing-7e72144c6807c9e0b2720f7d3cfe86e52a4d858a.tar.gz
Enable release_max_level_off feature in libtracing_max_level_off
The update to 0.1.40 slightly changed the handling of `max_level_*` features [1]. Before, enabling `max_level_*` affected both debug and release builds, unless some `release_max_level_*` was set. Now, `max_level_*` only affect debug builds, and `release_max_level_*` only release builds. `libtracing_max_level_off` sets `max_level_off`, but not `release_max_level_off`. This CL enables enables both `*max_level_off` features to keep the behavior from before the update. Android.bp change generated with: cargo_embargo generate cargo_embargo.json [1] https://github.com/tokio-rs/tracing/commit/5722b4503e01686ef9ca00882003ee8579e3e18e Bug: b/324259833 Test: local rerun of the internal test case from bug above Change-Id: Ifa4b3f46dc26af4010aa6e9fe62d4b45cdf57c68
-rw-r--r--Android.bp5
-rw-r--r--cargo_embargo.json3
2 files changed, 6 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 6763dec..77fb5bb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,7 +53,10 @@ rust_library {
cargo_pkg_version: "0.1.40",
srcs: ["src/lib.rs"],
edition: "2018",
- features: ["max_level_off"],
+ features: [
+ "max_level_off",
+ "release_max_level_off",
+ ],
rustlibs: [
"libpin_project_lite",
"libtracing_core",
diff --git a/cargo_embargo.json b/cargo_embargo.json
index 188aefd..33fc981 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -4,7 +4,8 @@
{},
{
"features": [
- "max_level_off"
+ "max_level_off",
+ "release_max_level_off"
],
"module_name_overrides": {
"libtracing": "libtracing_max_level_off"