chip-tool: DeviceScanner.cpp should be ifdef'd for Darwin #36783
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is done in the header file but not in the .cpp. This PR fixes it.
|
Review changes with |
|
PR #36783: Size comparison from 8606290 to e9f6c83 Full report (69 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
andy31415
reviewed
Dec 10, 2024
| @@ -17,6 +17,7 @@ | |||
| */ | |||
|
|
|||
| #include "DeviceScanner.h" | |||
| #if CHIP_DEVICE_LAYER_TARGET_DARWIN | |||
There was a problem hiding this comment.
can this be a build rule thing instead to not include the cpp file for chip-tool for non-darwin?
I find that easier than a include all CPP files and then rely on ifdefs to have code or not
There was a problem hiding this comment.
This is already conditional in https://github.com/project-chip/connectedhomeip/blob/master/examples/chip-tool/BUILD.gn#L101
There was a problem hiding this comment.
Right, I missed this! I think I can get around that without this code change. I'll abandon this PR. Thanks!
andy31415
requested changes
Dec 10, 2024
There was a problem hiding this comment.
ifdef a cpp file based on compile comments seems like an undesirable pattern. We do use it in places by "include * and then rely on constants" typically because we alter generated code, however I would very much prefer not to do this. It is harder to follow "does this define exist" vs "does this file get compiled".
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#if CHIP_DEVICE_LAYER_TARGET_DARWINis used in the header fileDeviceScanner.hto exclude code from building for other targets but it's not used inDeviceScanner.cpp. This causes build failures for non-Darwin targets because some types, such asDeviceScannerare defined in the header and referred to in the .cpp file.This PR fixes it by enclosing the code in the cpp file between
CHIP_DEVICE_LAYER_TARGET_DARWIN.