Skip to content

Commit a601e55

Browse files
Make default AddressResolve implementation the default
This avoids having to manually define CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER with the default value in non-gn build systems (e.g. Xcode).
1 parent ff2ab2b commit a601e55

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

src/darwin/Framework/Matter.xcodeproj/project.pbxproj

-5
Original file line numberDiff line numberDiff line change
@@ -2031,7 +2031,6 @@
20312031
GCC_PREPROCESSOR_DEFINITIONS = (
20322032
"$(inherited)",
20332033
CHIP_HAVE_CONFIG_H,
2034-
"CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib/address_resolve/AddressResolve_DefaultImpl.h>",
20352034
CONFIG_BUILD_FOR_HOST_UNIT_TEST,
20362035
"CHIP_CONFIG_SKIP_APP_SPECIFIC_GENERATED_HEADER_INCLUDES=1",
20372036
"CONFIG_USE_INTERACTIVE_MODE=1",
@@ -2105,7 +2104,6 @@
21052104
GCC_PREPROCESSOR_DEFINITIONS = (
21062105
"$(inherited)",
21072106
CHIP_HAVE_CONFIG_H,
2108-
"CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib/address_resolve/AddressResolve_DefaultImpl.h>",
21092107
CONFIG_BUILD_FOR_HOST_UNIT_TEST,
21102108
"CHIP_CONFIG_SKIP_APP_SPECIFIC_GENERATED_HEADER_INCLUDES=1",
21112109
"CONFIG_USE_INTERACTIVE_MODE=1",
@@ -2208,7 +2206,6 @@
22082206
GCC_OPTIMIZATION_LEVEL = 0;
22092207
GCC_PREPROCESSOR_DEFINITIONS = (
22102208
"DEBUG=1",
2211-
"CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib/address_resolve/AddressResolve_DefaultImpl.h>",
22122209
"$(inherited)",
22132210
);
22142211
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
@@ -2252,7 +2249,6 @@
22522249
DYLIB_INSTALL_NAME_BASE = "@rpath";
22532250
GCC_PREPROCESSOR_DEFINITIONS = (
22542251
CHIP_HAVE_CONFIG_H,
2255-
"CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib/address_resolve/AddressResolve_DefaultImpl.h>",
22562252
"$(inherited)",
22572253
"CHIP_CONFIG_SKIP_APP_SPECIFIC_GENERATED_HEADER_INCLUDES=1",
22582254
"MTR_ENABLE_PROVISIONAL=1",
@@ -2422,7 +2418,6 @@
24222418
DYLIB_INSTALL_NAME_BASE = "@rpath";
24232419
GCC_PREPROCESSOR_DEFINITIONS = (
24242420
CHIP_HAVE_CONFIG_H,
2425-
"CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib/address_resolve/AddressResolve_DefaultImpl.h>",
24262421
"$(inherited)",
24272422
"CHIP_CONFIG_SKIP_APP_SPECIFIC_GENERATED_HEADER_INCLUDES=1",
24282423
"MTR_ENABLE_PROVISIONAL=1",

src/lib/address_resolve/AddressResolve.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -253,13 +253,17 @@ class Resolver
253253
} // namespace AddressResolve
254254
} // namespace chip
255255

256-
// outside the open space, include the required platform headers for the
257-
// actual implementation.
256+
// Include the required platform header for the actual implementation, if defined.
257+
// Otherwise assume the default implementation is being used.
258258
// Expectations of this include:
259259
// - define the `Impl::NodeLookupHandle` deriving from NodeLookupHandleBase
260260
// - corresponding CPP file should provide a valid Resolver::Instance()
261261
// implementation
262+
#ifdef CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER
262263
#include CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER
264+
#else
265+
#include <lib/address_resolve/AddressResolve_DefaultImpl.h>
266+
#endif
263267

264268
namespace chip {
265269
namespace AddressResolve {

src/lib/address_resolve/BUILD.gn

-6
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ import("//build_overrides/chip.gni")
1717

1818
import("address_resolve.gni")
1919

20-
config("default_address_resolve_config") {
21-
defines = [ "CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib/address_resolve/AddressResolve_DefaultImpl.h>" ]
22-
}
23-
2420
static_library("address_resolve") {
2521
public_deps = [
2622
"${chip_root}/src/lib/asn1",
@@ -44,8 +40,6 @@ static_library("address_resolve") {
4440
"AddressResolve_DefaultImpl.cpp",
4541
"AddressResolve_DefaultImpl.h",
4642
]
47-
48-
public_configs = [ ":default_address_resolve_config" ]
4943
} else if (chip_address_resolve_strategy == "custom") {
5044
# nothing to do here, custom implementation
5145
# assume CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER is defined as a constant

0 commit comments

Comments
 (0)