Skip to content

Commit

Permalink
Fix TI simplelink in unified build (#4983)
Browse files Browse the repository at this point in the history
This broke after e76ed54 ("CC26X2X7 Initial support of BLE Rendezvous (#4865)")

ERROR at //config/cc13x2_26x2/toolchain/BUILD.gn:23:5: Unable to load "/home/spang/connectedhomeip2/examples/lock-app/cc13x2_26x2/args.gni".
    import("${chip_root}/examples/lock-app/cc13x2_26x2/args.gni")
    ^-----------------------------------------------------------
See //BUILD.gn:245:16: which caused the file to be included.
      deps = [ "${chip_root}/examples/lock-app/cc13x2_26x2(${chip_root}/config/cc13x2_26x2/toolchain:cc13x2_26x2_lock_app)" ]
               ^--------------------------------------------------------------------------------

Fix the build file to use the new paths.

Tested via
  gn gen out/unified --args="target_os=\"all\" enable_ti_simplelink_builds=true ti_simplelink_sdk_root=\"$HOME/ti/simplelink_cc13x2_26x2_sdk_4_40_05_02_eng\" ti_sysconfig_root=\"$HOME/ti/sysconfig_1.7.0\" enable_linux_bridge_app_build=false"
  • Loading branch information
mspang authored Feb 24, 2021
1 parent d48bcf2 commit 2891d6b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
enable_android_builds = false

# Set this to true to enable TI builds by default.
enable_cc13x2_26x2_builds = false
enable_ti_simplelink_builds = false

# Set this to true to enable efr32 builds by default.
enable_efr32_builds = false
Expand Down Expand Up @@ -179,8 +179,8 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
enable_linux_lighting_app_build =
enable_default_builds && (host_os == "linux" || host_os == "mac")

# Build the cc13x2_26x2 lock app example.
enable_cc13x2_26x2_lock_app_build = enable_cc13x2_26x2_builds
# Build the cc13x2x7_26x2x7 lock app example.
enable_cc13x2x7_26x2x7_lock_app_build = enable_ti_simplelink_builds

# Build the efr32 lock app example.
enable_efr32_lock_app_build = enable_efr32_builds
Expand Down Expand Up @@ -240,9 +240,9 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
}
}

if (enable_cc13x2_26x2_lock_app_build) {
group("cc13x2_26x2_lock_app") {
deps = [ "${chip_root}/examples/lock-app/cc13x2_26x2(${chip_root}/config/cc13x2_26x2/toolchain:cc13x2_26x2_lock_app)" ]
if (enable_cc13x2x7_26x2x7_lock_app_build) {
group("cc13x2x7_26x2x7_lock_app") {
deps = [ "${chip_root}/examples/lock-app/cc13x2x7_26x2x7(${chip_root}/config/cc13x2_26x2/toolchain:cc13x2x7_26x2x7_lock_app)" ]
}
}

Expand Down Expand Up @@ -346,8 +346,8 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
if (enable_qpg6100_lock_app_build) {
deps += [ ":qpg6100_lock_app" ]
}
if (enable_cc13x2_26x2_lock_app_build) {
deps += [ ":cc13x2_26x2_lock_app" ]
if (enable_cc13x2x7_26x2x7_lock_app_build) {
deps += [ ":cc13x2x7_26x2x7_lock_app" ]
}
}

Expand Down
4 changes: 2 additions & 2 deletions config/cc13x2_26x2/toolchain/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import("//build_overrides/chip.gni")

import("${build_root}/toolchain/arm_gcc/arm_toolchain.gni")

arm_toolchain("cc13x2_26x2_lock_app") {
arm_toolchain("cc13x2x7_26x2x7_lock_app") {
toolchain_args = {
current_os = "freertos"
import("${chip_root}/examples/lock-app/cc13x2_26x2/args.gni")
import("${chip_root}/examples/lock-app/cc13x2x7_26x2x7/args.gni")
}
}

0 comments on commit 2891d6b

Please sign in to comment.