Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tidy up logging dependencies #34789

Merged
merged 2 commits into from
Aug 6, 2024
Merged

Tidy up logging dependencies #34789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8369c1e
Remove workarounds for stdio logging target
ksperling-apple Aug 5, 2024
676353c
Pull in android logging in the standard way
ksperling-apple Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/lib/support/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,11 +301,9 @@ static_library("support") {
"${chip_root}/src/inet:inet_config_header",
]

# Android has no 'platform' that provides logging
if (current_os == "android") {
public_deps += [ "${chip_root}/src/platform/android:logging" ]
}

# Platforms that utilize CHIP_SYSTEM_CONFIG_PLATFORM_LOG need to
# be pulled in here as public_deps since they hook into logging at
# the macro level rather than just providing a LogV implementation.
if (current_os == "mac" || current_os == "ios") {
public_deps += [ "${chip_root}/src/platform/Darwin:logging" ]
}
Expand Down
18 changes: 4 additions & 14 deletions src/platform/logging/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,11 @@ source_set("default") {
deps += [ ":stdio" ]
} else if (chip_device_platform == "nuttx") {
deps += [ "${chip_root}/src/platform/NuttX:logging" ]
} else if (chip_device_platform == "android") {
deps += [ "${chip_root}/src/platform/android:logging" ]
} else {
assert(
chip_device_platform == "fake" || chip_device_platform == "android" ||
chip_device_platform == "external" || chip_device_platform == "none")
assert(chip_device_platform == "fake" ||
chip_device_platform == "external" || chip_device_platform == "none")
}
}
}
Expand All @@ -88,11 +89,6 @@ source_set("headers") {
public = [ "LogV.h" ]
}

# We need to reference the output file of ":stdio" at build time,
# but get_target_outputs() does not work for binary targets. As a
# workaround, define a reasonable path and make the target use it.
stdio_archive = "$root_out_dir/liblogging-stdio.a"

source_set("stdio") {
sources = [ "impl/stdio/Logging.cpp" ]

Expand All @@ -104,10 +100,4 @@ source_set("stdio") {
"${chip_root}/src/platform:platform_config_header",
"${chip_root}/src/platform/logging:headers",
]

# Ensure we end up with the expected output file name
output_dir = get_path_info(stdio_archive, "dir")
output_name = get_path_info(stdio_archive, "name")
output_extension = get_path_info(stdio_archive, "extension")
output_prefix_override = true
}
Loading