From 00a3e1ca4e887204c71469f8678f2b593292a7b9 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Tue, 21 Nov 2023 09:48:54 -0500 Subject: [PATCH 1/2] Add comment regarding why platforms depend on address resolve config --- src/platform/Infineon/CYW30739/BUILD.gn | 5 +++++ src/platform/bouffalolab/BL702/BUILD.gn | 10 +++++++--- src/platform/bouffalolab/BL702L/BUILD.gn | 10 +++++++--- src/platform/cc13xx_26xx/cc13x2_26x2/BUILD.gn | 5 +++++ src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn | 5 +++++ src/platform/nxp/k32w/k32w0/BUILD.gn | 10 +++++++--- src/platform/nxp/k32w/k32w1/BUILD.gn | 4 ++++ src/platform/nxp/rt/rw61x/BUILD.gn | 5 ++++- src/platform/qpg/BUILD.gn | 4 ++++ src/platform/silabs/efr32/BUILD.gn | 4 ++++ src/platform/stm32/BUILD.gn | 4 ++++ 11 files changed, 56 insertions(+), 10 deletions(-) diff --git a/src/platform/Infineon/CYW30739/BUILD.gn b/src/platform/Infineon/CYW30739/BUILD.gn index 51a3be470e36c3..ff0704fb37aedc 100644 --- a/src/platform/Infineon/CYW30739/BUILD.gn +++ b/src/platform/Infineon/CYW30739/BUILD.gn @@ -82,6 +82,11 @@ static_library("CYW30739") { "ThreadStackManagerImpl.cpp", "ThreadStackManagerImpl.h", ] + + # TODO: platform should NOT depend on default_address_resolve_config. This should + # be removed. See https://github.com/project-chip/connectedhomeip/issues/30596 + # + # Currently this exists because OpenThread platform includes src/app/Server.h public_configs = [ "${chip_root}/src/lib/address_resolve:default_address_resolve_config", ] diff --git a/src/platform/bouffalolab/BL702/BUILD.gn b/src/platform/bouffalolab/BL702/BUILD.gn index 831f0d27679e21..1af1c8ec2c60fb 100644 --- a/src/platform/bouffalolab/BL702/BUILD.gn +++ b/src/platform/bouffalolab/BL702/BUILD.gn @@ -101,6 +101,13 @@ static_library("BL702") { ] deps += [ "${chip_root}/src/lib/dnssd:platform_header" ] } + + # TODO: platform should NOT depend on default_address_resolve_config. This should + # be removed. See https://github.com/project-chip/connectedhomeip/issues/30596 + # + # Currently this exists because OpenThread platform includes src/app/Server.h + public_configs = + [ "${chip_root}/src/lib/address_resolve:default_address_resolve_config" ] } if (chip_enable_ethernet) { @@ -115,7 +122,4 @@ static_library("BL702") { deps += [ "${chip_root}/src/credentials:credentials_header" ] public_deps = [ "${chip_root}/src/platform:platform_base" ] - - public_configs = - [ "${chip_root}/src/lib/address_resolve:default_address_resolve_config" ] } diff --git a/src/platform/bouffalolab/BL702L/BUILD.gn b/src/platform/bouffalolab/BL702L/BUILD.gn index d4e077d5922802..9ba28551c6b84a 100644 --- a/src/platform/bouffalolab/BL702L/BUILD.gn +++ b/src/platform/bouffalolab/BL702L/BUILD.gn @@ -88,11 +88,15 @@ static_library("BL702L") { ] deps += [ "${chip_root}/src/lib/dnssd:platform_header" ] } + + # TODO: platform should NOT depend on default_address_resolve_config. This should + # be removed. See https://github.com/project-chip/connectedhomeip/issues/30596 + # + # Currently this exists because OpenThread platform includes src/app/Server.h + public_configs = + [ "${chip_root}/src/lib/address_resolve:default_address_resolve_config" ] } deps += [ "${chip_root}/src/credentials:credentials_header" ] public_deps = [ "${chip_root}/src/platform:platform_base" ] - - public_configs = - [ "${chip_root}/src/lib/address_resolve:default_address_resolve_config" ] } diff --git a/src/platform/cc13xx_26xx/cc13x2_26x2/BUILD.gn b/src/platform/cc13xx_26xx/cc13x2_26x2/BUILD.gn index 18dfc7dff0bf58..f293eee81e3e58 100644 --- a/src/platform/cc13xx_26xx/cc13x2_26x2/BUILD.gn +++ b/src/platform/cc13xx_26xx/cc13x2_26x2/BUILD.gn @@ -52,6 +52,11 @@ static_library("cc13x2_26x2") { "${chip_root}/src/crypto", "${chip_root}/src/platform:platform_base", ] + + # TODO: platform should NOT depend on default_address_resolve_config. This should + # be removed. See https://github.com/project-chip/connectedhomeip/issues/30596 + # + # Currently this exists because OpenThread platform includes src/app/Server.h public_configs = [ "${chip_root}/src/lib/address_resolve:default_address_resolve_config" ] diff --git a/src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn b/src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn index 1dd6933b2f23ca..d6967347eca720 100644 --- a/src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn +++ b/src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn @@ -52,6 +52,11 @@ static_library("cc13x4_26x4") { "${chip_root}/src/crypto", "${chip_root}/src/platform:platform_base", ] + + # TODO: platform should NOT depend on default_address_resolve_config. This should + # be removed. See https://github.com/project-chip/connectedhomeip/issues/30596 + # + # Currently this exists because OpenThread platform includes src/app/Server.h public_configs = [ "${chip_root}/src/lib/address_resolve:default_address_resolve_config" ] diff --git a/src/platform/nxp/k32w/k32w0/BUILD.gn b/src/platform/nxp/k32w/k32w0/BUILD.gn index 193ba06d78a271..197dc255425b5f 100644 --- a/src/platform/nxp/k32w/k32w0/BUILD.gn +++ b/src/platform/nxp/k32w/k32w0/BUILD.gn @@ -140,10 +140,14 @@ static_library("k32w0") { ] deps += [ "${chip_root}/src/lib/dnssd:platform_header" ] } + + # TODO: platform should NOT depend on default_address_resolve_config. This should + # be removed. See https://github.com/project-chip/connectedhomeip/issues/30596 + # + # Currently this exists because OpenThread platform includes src/app/Server.h + public_configs = + [ "${chip_root}/src/lib/address_resolve:default_address_resolve_config" ] } public_deps += [ "${chip_root}/src/crypto" ] - - public_configs = - [ "${chip_root}/src/lib/address_resolve:default_address_resolve_config" ] } diff --git a/src/platform/nxp/k32w/k32w1/BUILD.gn b/src/platform/nxp/k32w/k32w1/BUILD.gn index 5b42263b8380a0..053f8d784ac180 100644 --- a/src/platform/nxp/k32w/k32w1/BUILD.gn +++ b/src/platform/nxp/k32w/k32w1/BUILD.gn @@ -107,6 +107,10 @@ static_library("k32w1") { public_deps += [ "${chip_root}/src/crypto" ] + # TODO: platform should NOT depend on default_address_resolve_config. This should + # be removed. See https://github.com/project-chip/connectedhomeip/issues/30596 + # + # Currently this exists because OpenThread platform includes src/app/Server.h public_configs = [ "${chip_root}/src/lib/address_resolve:default_address_resolve_config" ] } diff --git a/src/platform/nxp/rt/rw61x/BUILD.gn b/src/platform/nxp/rt/rw61x/BUILD.gn index d8a72d1e449718..1cf0b5ac55f9a7 100644 --- a/src/platform/nxp/rt/rw61x/BUILD.gn +++ b/src/platform/nxp/rt/rw61x/BUILD.gn @@ -147,7 +147,10 @@ static_library("nxp_platform") { public_configs = [ ":nxp_platform_config", - # address_resolve config needed by the include of server.h in ConfigurationManagerImpl.cpp + # TODO: platform should NOT depend on default_address_resolve_config. This should + # be removed. See https://github.com/project-chip/connectedhomeip/issues/30596 + # + # Currently this exists because OpenThread platform includes src/app/Server.h "${chip_root}/src/lib/address_resolve:default_address_resolve_config", ] } diff --git a/src/platform/qpg/BUILD.gn b/src/platform/qpg/BUILD.gn index 9122243c005874..4e1e5241269cc8 100644 --- a/src/platform/qpg/BUILD.gn +++ b/src/platform/qpg/BUILD.gn @@ -70,6 +70,10 @@ static_library("qpg") { public_deps += [ "${openthread_root}:libopenthread-mtd" ] } + # TODO: platform should NOT depend on default_address_resolve_config. This should + # be removed. See https://github.com/project-chip/connectedhomeip/issues/30596 + # + # Currently this exists because OpenThread platform includes src/app/Server.h public_configs += [ "${chip_root}/third_party/openthread/platforms/qpg:openthread_qpg_config", "${chip_root}/src/lib/address_resolve:default_address_resolve_config", diff --git a/src/platform/silabs/efr32/BUILD.gn b/src/platform/silabs/efr32/BUILD.gn index 36d3a05787c16f..5c7eef17f65875 100644 --- a/src/platform/silabs/efr32/BUILD.gn +++ b/src/platform/silabs/efr32/BUILD.gn @@ -124,6 +124,10 @@ static_library("efr32") { deps += [ "${chip_root}/src/lib/dnssd:platform_header" ] } + # TODO: platform should NOT depend on default_address_resolve_config. This should + # be removed. See https://github.com/project-chip/connectedhomeip/issues/30596 + # + # Currently this exists because OpenThread platform includes src/app/Server.h public_configs = [ "${chip_root}/src/lib/address_resolve:default_address_resolve_config", ] diff --git a/src/platform/stm32/BUILD.gn b/src/platform/stm32/BUILD.gn index bc823db59aedf1..f6610d7ff7329a 100644 --- a/src/platform/stm32/BUILD.gn +++ b/src/platform/stm32/BUILD.gn @@ -90,6 +90,10 @@ static_library("stm32") { deps += [ "${chip_root}/src/lib/dnssd:platform_header" ] + # TODO: platform should NOT depend on default_address_resolve_config. This should + # be removed. See https://github.com/project-chip/connectedhomeip/issues/30596 + # + # Currently this exists because OpenThread platform includes src/app/Server.h public_configs = [ "${chip_root}/src/lib/address_resolve:default_address_resolve_config", ] From 003bb5a93549665f0038fd505b115a9ff7214694 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Tue, 21 Nov 2023 09:53:21 -0500 Subject: [PATCH 2/2] Restyle --- src/platform/bouffalolab/BL702/BUILD.gn | 5 +++-- src/platform/bouffalolab/BL702L/BUILD.gn | 5 +++-- src/platform/nxp/k32w/k32w0/BUILD.gn | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/platform/bouffalolab/BL702/BUILD.gn b/src/platform/bouffalolab/BL702/BUILD.gn index 1af1c8ec2c60fb..28cc128fd7fb61 100644 --- a/src/platform/bouffalolab/BL702/BUILD.gn +++ b/src/platform/bouffalolab/BL702/BUILD.gn @@ -106,8 +106,9 @@ static_library("BL702") { # be removed. See https://github.com/project-chip/connectedhomeip/issues/30596 # # Currently this exists because OpenThread platform includes src/app/Server.h - public_configs = - [ "${chip_root}/src/lib/address_resolve:default_address_resolve_config" ] + public_configs = [ + "${chip_root}/src/lib/address_resolve:default_address_resolve_config", + ] } if (chip_enable_ethernet) { diff --git a/src/platform/bouffalolab/BL702L/BUILD.gn b/src/platform/bouffalolab/BL702L/BUILD.gn index 9ba28551c6b84a..4e018cf8cd65ad 100644 --- a/src/platform/bouffalolab/BL702L/BUILD.gn +++ b/src/platform/bouffalolab/BL702L/BUILD.gn @@ -93,8 +93,9 @@ static_library("BL702L") { # be removed. See https://github.com/project-chip/connectedhomeip/issues/30596 # # Currently this exists because OpenThread platform includes src/app/Server.h - public_configs = - [ "${chip_root}/src/lib/address_resolve:default_address_resolve_config" ] + public_configs = [ + "${chip_root}/src/lib/address_resolve:default_address_resolve_config", + ] } deps += [ "${chip_root}/src/credentials:credentials_header" ] diff --git a/src/platform/nxp/k32w/k32w0/BUILD.gn b/src/platform/nxp/k32w/k32w0/BUILD.gn index 197dc255425b5f..a5c204a10b956c 100644 --- a/src/platform/nxp/k32w/k32w0/BUILD.gn +++ b/src/platform/nxp/k32w/k32w0/BUILD.gn @@ -145,8 +145,9 @@ static_library("k32w0") { # be removed. See https://github.com/project-chip/connectedhomeip/issues/30596 # # Currently this exists because OpenThread platform includes src/app/Server.h - public_configs = - [ "${chip_root}/src/lib/address_resolve:default_address_resolve_config" ] + public_configs = [ + "${chip_root}/src/lib/address_resolve:default_address_resolve_config", + ] } public_deps += [ "${chip_root}/src/crypto" ]