Skip to content

Commit

Permalink
[Silabs] Add provisioning root argument (#37175)
Browse files Browse the repository at this point in the history
* [SL-UP] Add provisioning root argument (#231)

* Restyled by gn

---------

Co-authored-by: Restyled.io <[email protected]>
  • Loading branch information
mkardous-silabs and restyled-commits authored Jan 23, 2025
1 parent 43f37d1 commit 87de90d
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 7 deletions.
3 changes: 2 additions & 1 deletion examples/platform/silabs/SiWx917/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
import("${chip_root}/examples/platform/silabs/args.gni")
import("${chip_root}/src/lib/lib.gni")
import("${chip_root}/src/platform/device.gni")
import("${chip_root}/src/platform/silabs/provision/args.gni")
import("${chip_root}/src/platform/silabs/wifi/args.gni")
import("${chip_root}/third_party/silabs/silabs_board.gni")
import("${silabs_sdk_build_root}/SiWx917_sdk.gni")
Expand Down Expand Up @@ -67,7 +68,7 @@ source_set("test-event-trigger") {
"${silabs_common_plat_dir}/SilabsTestEventTriggerDelegate.h",
]

deps = [ "${chip_root}/src/platform/silabs/provision:provision-headers" ]
deps = [ "${sl_provision_root}:provision-headers" ]
public_configs = [ ":test-event-trigger-config" ]
public_deps = [
"${chip_root}/src/app:test-event-trigger",
Expand Down
3 changes: 2 additions & 1 deletion examples/platform/silabs/efr32/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
import("${chip_root}/src/app/icd/icd.gni")
import("${chip_root}/src/lib/lib.gni")
import("${chip_root}/src/platform/device.gni")
import("${chip_root}/src/platform/silabs/provision/args.gni")
import("${silabs_sdk_build_root}/efr32_sdk.gni")
import("${silabs_sdk_build_root}/silabs_board.gni")

Expand Down Expand Up @@ -71,7 +72,7 @@ source_set("test-event-trigger") {
"${silabs_common_plat_dir}/SilabsTestEventTriggerDelegate.h",
]

deps = [ "${chip_root}/src/platform/silabs/provision:provision-headers" ]
deps = [ "${sl_provision_root}:provision-headers" ]
public_configs = [ ":test-event-trigger-config" ]
public_deps = [
"${chip_root}/src/app:test-event-trigger",
Expand Down
4 changes: 2 additions & 2 deletions examples/platform/silabs/provision/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import("//build_overrides/chip.gni")
import("//build_overrides/efr32_sdk.gni")
import("${chip_root}/src/platform/silabs/provision/args.gni")
import("${silabs_sdk_build_root}/silabs_board.gni")

if (wifi_soc) {
Expand Down Expand Up @@ -48,8 +49,7 @@ source_set("storage") {

deps = [ "${chip_root}/src/lib" ]

public_deps =
[ "${chip_root}/src/platform/silabs/provision:provision-headers" ]
public_deps = [ "${sl_provision_root}:provision-headers" ]

if (sl_enable_test_event_trigger) {
# Temporary workaround since we have duplicated configurations
Expand Down
6 changes: 5 additions & 1 deletion src/platform/silabs/SiWx917/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import("${chip_root}/src/platform/device.gni")

import("${chip_root}/build/chip/buildconfig_header.gni")
import("${chip_root}/src/crypto/crypto.gni")
import("${chip_root}/src/platform/silabs/provision/args.gni")
import("${chip_root}/src/platform/silabs/wifi/args.gni")
import("${chip_root}/third_party/silabs/SiWx917_sdk.gni")
import("${chip_root}/third_party/silabs/silabs_board.gni")
Expand Down Expand Up @@ -87,7 +88,10 @@ static_library("SiWx917") {
"${chip_root}/src/app/icd/server:icd-server-config",
"${chip_root}/src/platform:platform_base",
]
deps = [ "${chip_root}/src/platform/logging:headers" ]
deps = [
"${chip_root}/src/platform/logging:headers",
"${sl_provision_root}:provision-headers",
]

# Add platform crypto implementation
if (chip_crypto == "platform") {
Expand Down
3 changes: 2 additions & 1 deletion src/platform/silabs/efr32/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import("//build_overrides/chip.gni")
import("${chip_root}/build/chip/buildconfig_header.gni")
import("${chip_root}/src/crypto/crypto.gni")
import("${chip_root}/src/platform/device.gni")
import("${chip_root}/src/platform/silabs/provision/args.gni")
import("${chip_root}/third_party/silabs/efr32_sdk.gni")
import("${chip_root}/third_party/silabs/silabs_board.gni")

Expand Down Expand Up @@ -114,7 +115,7 @@ static_library("efr32") {
"${chip_root}/src/platform:platform_base",
"${chip_root}/src/platform/logging:headers",
]
deps = [ "${silabs_platform_dir}/provision:provision-headers" ]
deps = [ "${sl_provision_root}:provision-headers" ]
public_configs = []

# Add platform crypto implementation
Expand Down
19 changes: 19 additions & 0 deletions src/platform/silabs/provision/args.gni
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Copyright (c) 2020 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")

declare_args() {
sl_provision_root = "${chip_root}/src/platform/silabs/provision"
}
3 changes: 2 additions & 1 deletion src/test_driver/efr32/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import("//build_overrides/efr32_sdk.gni")
import("//build_overrides/pigweed.gni")

import("${build_root}/config/defaults.gni")
import("${chip_root}/src/platform/silabs/provision/args.gni")
import("${silabs_sdk_build_root}/efr32_sdk.gni")

import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
Expand Down Expand Up @@ -94,8 +95,8 @@ source_set("efr32_test_main") {
"${chip_root}/examples/common/pigweed:system_rpc_server",
"${chip_root}/src/lib",
"${chip_root}/src/lib/support:pw_tests_wrapper",
"${chip_root}/src/platform/silabs/provision:provision-headers",
"${examples_common_plat_dir}/pw_sys_io:pw_sys_io_silabs",
"${sl_provision_root}:provision-headers",
]

# OpenThread Settings
Expand Down

0 comments on commit 87de90d

Please sign in to comment.