Remove ICD server sources from chip_data_model.cmake #37513
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
|
Review changes with |
|
PR #37513: Size comparison from c36e74b to e0320f9 Full report (72 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
adigie
force-pushed
the
dont-build-icd-twice
branch
5 times, most recently
from
ee97841 to
df2909b
Compare
|
PR #37513: Size comparison from d0e4459 to df2909b Full report (45 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, nrfconnect, psoc6, qpg, stm32, telink, tizen)
|
adigie
force-pushed
the
dont-build-icd-twice
branch
2 times, most recently
from
0354773 to
712cb86
Compare
|
PR #37513: Size comparison from d0e4459 to 712cb86 Full report (45 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, nrfconnect, psoc6, qpg, stm32, telink, tizen)
|
adigie
force-pushed
the
dont-build-icd-twice
branch
2 times, most recently
from
fea276a to
4dea390
Compare
|
PR #37513: Size comparison from d0e4459 to 4dea390 Full report (72 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
adigie
force-pushed
the
dont-build-icd-twice
branch
from
4dea390 to
fc50e29
Compare
adigie
force-pushed
the
dont-build-icd-twice
branch
3 times, most recently
from
f2bac9c to
059c559
Compare
|
PR #37513: Size comparison from b99f977 to 059c559 Full report (28 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, nrfconnect, qpg, stm32, telink, tizen)
|
adigie
force-pushed
the
dont-build-icd-twice
branch
2 times, most recently
from
2eb81b0 to
d64f954
Compare
|
PR #37513: Size comparison from 4657e36 to d64f954 Full report (72 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
| @@ -41,6 +39,8 @@ | |||
| #include CHIP_DEVICE_PROJECT_CONFIG_INCLUDE | |||
| #endif | |||
|
|
|||
| #include <lib/core/CHIPConfig.h> | |||
There was a problem hiding this comment.
Makes sense, but this change to how core config stuff works should probably be a separate PR with a clear description and commit message explaining the change, to aid in bisecting if problems arise.
There was a problem hiding this comment.
Opened a separate PR: #37550
There was a problem hiding this comment.
It seems that this change won't be needed as the issue can be fixed by defining chip_project_config_include as it's done on other platforms. On darwin only chip_device_project_config_include was defined and that caused wrong order of the headers.
adigie
force-pushed
the
dont-build-icd-twice
branch
from
d64f954 to
0ce5d43
Compare
|
PR #37513: Size comparison from 92f9f0b to 0ce5d43 Full report (72 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
ICD server sources are built by gn, there is no need to compile them twice. Signed-off-by: Adrian Gielniewski <[email protected]>
Don't depend on ICD if it's not enabled. Signed-off-by: Adrian Gielniewski <[email protected]>
Signed-off-by: Adrian Gielniewski <[email protected]>
`chip_project_config_include` has to be set to get correct include order of configuration files in `CHIPDeviceConfig.h` and prevent macro redefined warnings coming from overriding defines already defined by `CHIPConfig.h`. Signed-off-by: Adrian Gielniewski <[email protected]>
adigie
force-pushed
the
dont-build-icd-twice
branch
from
0ce5d43 to
5f0a30e
Compare
|
PR #37513: Size comparison from d6ad867 to 5f0a30e Full report (72 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
bzbarsky-apple
approved these changes
Feb 15, 2025
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.
Changes
chip_data_model.cmake. They are built bygn, there is no need to compile them twice.Testing
Tested by building samples from nRF Connected SDK.