Skip to content

Commit

Permalink
servo: Merge #11033 - Set max log level on all platforms (from mbrube…
Browse files Browse the repository at this point in the history
…ck:max-log); r=metajack

Servo currently enabled the `release_max_level_info` feature for the log crate
in an Android-specific dependency.  Currently this works for all platforms
because of rust-lang/cargo#2524, but it might break if that issue is fixed.

Source-Repo: https://github.com/servo/servo
Source-Revision: ab12d8098fcc0517b64643d25683e2e15e665410

UltraBlame original commit: e1ac9162c087971de3a15094972cd44a45378bf5
  • Loading branch information
marco-c committed Oct 1, 2019
1 parent daf7341 commit 8091d9c
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions servo/components/servo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ doc = false
bench = false

[features]
default = ["glutin_app", "webdriver"]
default = ["glutin_app", "webdriver", "max_log_level"]
max_log_level = ["env_logger/log/release_max_level_info"]
webdriver = ["webdriver_server"]
energy-profiling = ["profile_traits/energy-profiling"]

Expand Down Expand Up @@ -75,7 +76,7 @@ libc = "0.2"
url = {version = "1.0.0", features = ["heap_size", "serde", "query_encoding"]}

[target.'cfg(target_os = "android")'.dependencies]
log = {version = "0.3", features = ["release_max_level_info"]}
log = "0.3"

[target.'cfg(not(target_os = "windows"))'.dependencies]
gaol = {git = "https://github.com/servo/gaol"}

0 comments on commit 8091d9c

Please sign in to comment.