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.

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

Cherry pick build optimizations from upstream #556

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

adigie
Copy link
Member

@adigie adigie commented Feb 18, 2025

  • Remove ICD server sources from chip_data_model.cmake
  • Fix ICD dependencies
  • Fix gn include warnings
  • iOS TVCasting app: Add missing chip_project_config_include
  • Fix ICD management server cluster dependecies
  • Remove workaround for upstream issue 32628

…#37513)

* Remove ICD server sources from chip_data_model.cmake

ICD server sources are built by gn, there is no need to compile them
twice.

Signed-off-by: Adrian Gielniewski <[email protected]>

* Fix ICD dependencies

Don't depend on ICD if it's not enabled.

Signed-off-by: Adrian Gielniewski <[email protected]>

* Fix gn include warnings

Signed-off-by: Adrian Gielniewski <[email protected]>

* iOS TVCasting app: Add missing chip_project_config_include

`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]>

---------

Signed-off-by: Adrian Gielniewski <[email protected]>
(cherry picked from commit abd2e1dad08396e51bc4a6f503f0d3e419507f96)
…ement server cluster is included (#37653)

* Fix ICD management server cluster dependecies

Add ICDConfigurationData to app sources when ICD management server
cluster is included in sample, but ICD support is disabled, e.g.
lock-app on some platforms.

Related to: #32321

Signed-off-by: Adrian Gielniewski <[email protected]>

* Add TODO comments for #32321

Add TODO comments for issue related to ICD management server.

Signed-off-by: Adrian Gielniewski <[email protected]>

---------

Signed-off-by: Adrian Gielniewski <[email protected]>
(cherry picked from commit 00c6f4ee91b79da9905eb827b5ae7e3018e34783)
Remove workaround as issue is resolved.

Signed-off-by: Adrian Gielniewski <[email protected]>
(cherry picked from commit 0086ee2073ed45d591068a7e4a8321d9dab1e96d)
@adigie adigie force-pushed the fromtree/dont-build-icd-twice branch from 875ea80 to 034b3f4 Compare February 19, 2025 14:48
@adigie adigie changed the title [nrf fromtree] Remove ICD server sources from chip_data_model.cmake Cherry pick build optimizations from upstream Feb 19, 2025
* Move some classes out of af-types.h

Move AttributesChangedListener and MarkAttributeDirty out of af-types.h

Signed-off-by: Adrian Gielniewski <[email protected]>

* Remove dependency to cluster-objects.h

Signed-off-by: Adrian Gielniewski <[email protected]>

* Remove cluster-objects from chip_data_model.cmake

Signed-off-by: Adrian Gielniewski <[email protected]>

* [Chef] Fix includes

Fix missing includes after changes in Accessors.h

Signed-off-by: Adrian Gielniewski <[email protected]>

* [Infineon] Fix includes

Fix missing includes after changes in Accessors.h

Signed-off-by: Adrian Gielniewski <[email protected]>

* [Silabs] Fix includes

Fix missing includes after changes in Accessors.h

Signed-off-by: Adrian Gielniewski <[email protected]>

---------

Signed-off-by: Adrian Gielniewski <[email protected]>
(cherry picked from commit 38cc24bd33f738ef02e2a81d67046325098d2349)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants