Skip to content

Commit 87de90d

Browse files
[Silabs] Add provisioning root argument (project-chip#37175)
* [SL-UP] Add provisioning root argument (project-chip#231) * Restyled by gn --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 43f37d1 commit 87de90d

File tree

7 files changed

+34
-7
lines changed

7 files changed

+34
-7
lines changed

examples/platform/silabs/SiWx917/BUILD.gn

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
1818
import("${chip_root}/examples/platform/silabs/args.gni")
1919
import("${chip_root}/src/lib/lib.gni")
2020
import("${chip_root}/src/platform/device.gni")
21+
import("${chip_root}/src/platform/silabs/provision/args.gni")
2122
import("${chip_root}/src/platform/silabs/wifi/args.gni")
2223
import("${chip_root}/third_party/silabs/silabs_board.gni")
2324
import("${silabs_sdk_build_root}/SiWx917_sdk.gni")
@@ -67,7 +68,7 @@ source_set("test-event-trigger") {
6768
"${silabs_common_plat_dir}/SilabsTestEventTriggerDelegate.h",
6869
]
6970

70-
deps = [ "${chip_root}/src/platform/silabs/provision:provision-headers" ]
71+
deps = [ "${sl_provision_root}:provision-headers" ]
7172
public_configs = [ ":test-event-trigger-config" ]
7273
public_deps = [
7374
"${chip_root}/src/app:test-event-trigger",

examples/platform/silabs/efr32/BUILD.gn

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
1818
import("${chip_root}/src/app/icd/icd.gni")
1919
import("${chip_root}/src/lib/lib.gni")
2020
import("${chip_root}/src/platform/device.gni")
21+
import("${chip_root}/src/platform/silabs/provision/args.gni")
2122
import("${silabs_sdk_build_root}/efr32_sdk.gni")
2223
import("${silabs_sdk_build_root}/silabs_board.gni")
2324

@@ -71,7 +72,7 @@ source_set("test-event-trigger") {
7172
"${silabs_common_plat_dir}/SilabsTestEventTriggerDelegate.h",
7273
]
7374

74-
deps = [ "${chip_root}/src/platform/silabs/provision:provision-headers" ]
75+
deps = [ "${sl_provision_root}:provision-headers" ]
7576
public_configs = [ ":test-event-trigger-config" ]
7677
public_deps = [
7778
"${chip_root}/src/app:test-event-trigger",

examples/platform/silabs/provision/BUILD.gn

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import("//build_overrides/chip.gni")
1616
import("//build_overrides/efr32_sdk.gni")
17+
import("${chip_root}/src/platform/silabs/provision/args.gni")
1718
import("${silabs_sdk_build_root}/silabs_board.gni")
1819

1920
if (wifi_soc) {
@@ -48,8 +49,7 @@ source_set("storage") {
4849

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

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

5454
if (sl_enable_test_event_trigger) {
5555
# Temporary workaround since we have duplicated configurations

src/platform/silabs/SiWx917/BUILD.gn

+5-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import("${chip_root}/src/platform/device.gni")
1818

1919
import("${chip_root}/build/chip/buildconfig_header.gni")
2020
import("${chip_root}/src/crypto/crypto.gni")
21+
import("${chip_root}/src/platform/silabs/provision/args.gni")
2122
import("${chip_root}/src/platform/silabs/wifi/args.gni")
2223
import("${chip_root}/third_party/silabs/SiWx917_sdk.gni")
2324
import("${chip_root}/third_party/silabs/silabs_board.gni")
@@ -87,7 +88,10 @@ static_library("SiWx917") {
8788
"${chip_root}/src/app/icd/server:icd-server-config",
8889
"${chip_root}/src/platform:platform_base",
8990
]
90-
deps = [ "${chip_root}/src/platform/logging:headers" ]
91+
deps = [
92+
"${chip_root}/src/platform/logging:headers",
93+
"${sl_provision_root}:provision-headers",
94+
]
9195

9296
# Add platform crypto implementation
9397
if (chip_crypto == "platform") {

src/platform/silabs/efr32/BUILD.gn

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import("//build_overrides/chip.gni")
1717
import("${chip_root}/build/chip/buildconfig_header.gni")
1818
import("${chip_root}/src/crypto/crypto.gni")
1919
import("${chip_root}/src/platform/device.gni")
20+
import("${chip_root}/src/platform/silabs/provision/args.gni")
2021
import("${chip_root}/third_party/silabs/efr32_sdk.gni")
2122
import("${chip_root}/third_party/silabs/silabs_board.gni")
2223

@@ -114,7 +115,7 @@ static_library("efr32") {
114115
"${chip_root}/src/platform:platform_base",
115116
"${chip_root}/src/platform/logging:headers",
116117
]
117-
deps = [ "${silabs_platform_dir}/provision:provision-headers" ]
118+
deps = [ "${sl_provision_root}:provision-headers" ]
118119
public_configs = []
119120

120121
# Add platform crypto implementation
+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Copyright (c) 2020 Project CHIP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
import("//build_overrides/chip.gni")
16+
17+
declare_args() {
18+
sl_provision_root = "${chip_root}/src/platform/silabs/provision"
19+
}

src/test_driver/efr32/BUILD.gn

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import("//build_overrides/efr32_sdk.gni")
1818
import("//build_overrides/pigweed.gni")
1919

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

2324
import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
@@ -94,8 +95,8 @@ source_set("efr32_test_main") {
9495
"${chip_root}/examples/common/pigweed:system_rpc_server",
9596
"${chip_root}/src/lib",
9697
"${chip_root}/src/lib/support:pw_tests_wrapper",
97-
"${chip_root}/src/platform/silabs/provision:provision-headers",
9898
"${examples_common_plat_dir}/pw_sys_io:pw_sys_io_silabs",
99+
"${sl_provision_root}:provision-headers",
99100
]
100101

101102
# OpenThread Settings

0 commit comments

Comments
 (0)