forked from project-chip/connectedhomeip
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into idm-4.2-troubleshoot
- Loading branch information
Showing
108 changed files
with
9,320 additions
and
538 deletions.
There are no files selected for viewing
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 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 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 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| # Copyright (c) 2024 Project CHIP Authors | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| import("//build_overrides/build.gni") | ||
|
|
||
| # The location of the build configuration file. | ||
| buildconfig = "${build_root}/config/BUILDCONFIG.gn" | ||
|
|
||
| # CHIP uses angle bracket includes. | ||
| check_system_includes = true | ||
|
|
||
| default_args = { | ||
| import("//args.gni") | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| # Copyright (c) 2024 Project CHIP Authors | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| import("//build_overrides/build.gni") | ||
| import("//build_overrides/chip.gni") | ||
|
|
||
| import("//build_overrides/editline.gni") | ||
| import("${chip_root}/build/chip/tools.gni") | ||
| import("${chip_root}/examples/fabric-admin/fabric-admin.gni") | ||
| import("${chip_root}/src/lib/core/core.gni") | ||
|
|
||
| assert(chip_build_tools) | ||
|
|
||
| config("config") { | ||
| include_dirs = [ | ||
| ".", | ||
| "${chip_root}/examples/common", | ||
| "${chip_root}/zzz_generated/app-common/app-common", | ||
| "${chip_root}/zzz_generated/chip-tool", | ||
| "${chip_root}/src/lib", | ||
| ] | ||
|
|
||
| defines = [ "CONFIG_USE_SEPARATE_EVENTLOOP=${config_use_separate_eventloop}" ] | ||
|
|
||
| # Note: CONFIG_USE_LOCAL_STORAGE is tested for via #ifdef, not #if. | ||
| if (config_use_local_storage) { | ||
| defines += [ "CONFIG_USE_LOCAL_STORAGE" ] | ||
| } | ||
|
|
||
| cflags = [ "-Wconversion" ] | ||
| } | ||
|
|
||
| static_library("fabric-admin-utils") { | ||
| sources = [ | ||
| "${chip_root}/src/controller/ExamplePersistentStorage.cpp", | ||
| "${chip_root}/src/controller/ExamplePersistentStorage.h", | ||
| "${chip_root}/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp", | ||
| "${chip_root}/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp", | ||
| "commands/clusters/ModelCommand.cpp", | ||
| "commands/clusters/ModelCommand.h", | ||
| "commands/common/CHIPCommand.cpp", | ||
| "commands/common/CHIPCommand.h", | ||
| "commands/common/Command.cpp", | ||
| "commands/common/Command.h", | ||
| "commands/common/Commands.cpp", | ||
| "commands/common/Commands.h", | ||
| "commands/common/CredentialIssuerCommands.h", | ||
| "commands/common/HexConversion.h", | ||
| "commands/common/RemoteDataModelLogger.cpp", | ||
| "commands/common/RemoteDataModelLogger.h", | ||
| "commands/pairing/OpenCommissioningWindowCommand.cpp", | ||
| "commands/pairing/OpenCommissioningWindowCommand.h", | ||
| "commands/pairing/PairingCommand.cpp", | ||
| "commands/pairing/ToTLVCert.cpp", | ||
| ] | ||
|
|
||
| deps = [ "${chip_root}/src/app:events" ] | ||
|
|
||
| sources += [ "commands/interactive/InteractiveCommands.cpp" ] | ||
| deps += [ | ||
| "${chip_root}/examples/common/websocket-server", | ||
| "${chip_root}/src/platform/logging:headers", | ||
| "${editline_root}:editline", | ||
| ] | ||
|
|
||
| if (chip_device_platform == "darwin") { | ||
| sources += [ "commands/common/DeviceScanner.cpp" ] | ||
| } | ||
|
|
||
| public_deps = [ | ||
| "${chip_root}/examples/common/tracing:commandline", | ||
| "${chip_root}/src/app/icd/client:handler", | ||
| "${chip_root}/src/app/icd/client:manager", | ||
| "${chip_root}/src/app/server", | ||
| "${chip_root}/src/app/tests/suites/commands/interaction_model", | ||
| "${chip_root}/src/controller/data_model", | ||
| "${chip_root}/src/credentials:file_attestation_trust_store", | ||
| "${chip_root}/src/lib", | ||
| "${chip_root}/src/lib/core:types", | ||
| "${chip_root}/src/lib/support/jsontlv", | ||
| "${chip_root}/src/platform", | ||
| "${chip_root}/third_party/inipp", | ||
| "${chip_root}/third_party/jsoncpp", | ||
| ] | ||
|
|
||
| public_configs = [ ":config" ] | ||
|
|
||
| if (chip_enable_transport_trace) { | ||
| public_deps += | ||
| [ "${chip_root}/examples/common/tracing:trace_handlers_decoder" ] | ||
| } | ||
|
|
||
| output_dir = root_out_dir | ||
| } | ||
|
|
||
| executable("fabric-admin") { | ||
| sources = [ "main.cpp" ] | ||
|
|
||
| deps = [ | ||
| ":fabric-admin-utils", | ||
| "${chip_root}/src/platform/logging:force_stdio", | ||
| ] | ||
|
|
||
| output_dir = root_out_dir | ||
| } | ||
|
|
||
| group("default") { | ||
| deps = [ ":fabric-admin" ] | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| # Copyright (c) 2024 Project CHIP Authors | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| import("//build_overrides/chip.gni") | ||
|
|
||
| import("${chip_root}/config/standalone/args.gni") | ||
|
|
||
| chip_device_project_config_include = "<CHIPProjectAppConfig.h>" | ||
| chip_project_config_include = "<CHIPProjectAppConfig.h>" | ||
| chip_system_project_config_include = "<SystemProjectConfig.h>" | ||
|
|
||
| chip_project_config_include_dirs = | ||
| [ "${chip_root}/examples/fabric-admin/include" ] | ||
| chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ] | ||
|
|
||
| matter_enable_tracing_support = true | ||
|
|
||
| matter_log_json_payload_hex = true | ||
| matter_log_json_payload_decode_full = true | ||
|
|
||
| # make fabric-admin very strict by default | ||
| chip_tlv_validate_char_string_on_read = true | ||
| chip_tlv_validate_char_string_on_write = true |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../build_overrides |
Oops, something went wrong.