Skip to content

Commit d13669b

Browse files
[NXP][k32w1] Fix gn import order
Signed-off-by: marius-alex-tache <marius.tache@nxp.com>
1 parent c417d44 commit d13669b

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

examples/lighting-app/nxp/k32w1/BUILD.gn

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ import("//build_overrides/chip.gni")
1616
import("//build_overrides/nxp_sdk.gni")
1717
import("//build_overrides/openthread.gni")
1818

19-
import("${nxp_sdk_build_root}/${nxp_sdk_name}/nxp_executable.gni")
2019
import("${nxp_sdk_build_root}/nxp_sdk.gni")
2120

21+
import("${nxp_sdk_build_root}/${nxp_sdk_name}/nxp_executable.gni")
22+
2223
import("${nxp_sdk_build_root}/${nxp_sdk_name}/${nxp_sdk_name}.gni")
2324

2425
import("${chip_root}/src/crypto/crypto.gni")

examples/platform/nxp/k32w1/app/support/BUILD.gn

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515
import("//build_overrides/chip.gni")
1616
import("//build_overrides/nxp_sdk.gni")
1717

18-
import("${chip_root}/src/platform/nxp/${nxp_platform}/args.gni")
1918
import("${nxp_sdk_matter_support_root}/gn_build/nxp_sdk.gni")
2019

20+
import("${chip_root}/src/platform/nxp/${nxp_platform}/args.gni")
21+
2122
config("support_config") {
2223
include_dirs = [ "${chip_root}" ]
2324

src/platform/nxp/k32w1/BUILD.gn

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ import("//build_overrides/openthread.gni")
1919
import("${chip_root}/src/crypto/crypto.gni")
2020
import("${chip_root}/src/platform/device.gni")
2121

22-
import("${nxp_sdk_build_root}/${nxp_sdk_name}/${nxp_sdk_name}.gni")
2322
import("${nxp_sdk_build_root}/nxp_sdk.gni")
2423

24+
import("${nxp_sdk_build_root}/${nxp_sdk_name}/${nxp_sdk_name}.gni")
25+
2526
assert(chip_device_platform == "nxp")
2627
assert(nxp_platform == "k32w1")
2728

src/platform/nxp/k32w1/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ declare_args() {
3131
k32w1_sdk_root = "${nxp_sdk_matter_support_root}/github_sdk/common_sdk/repo"
3232
}
3333

34-
if (sdk_release) {
34+
if (sdk_release || getenv("NXP_SDK_ROOT") != "") {
3535
k32w1_sdk_root = getenv("NXP_SDK_ROOT")
3636
}
3737

0 commit comments

Comments
 (0)