Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove duplicate declarations of build variables #17711

Merged
merged 1 commit into from
Apr 27, 2022
Merged

Remove duplicate declarations of build variables #17711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions config/tizen/chip-gn/args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@

import("//build_overrides/chip.gni")

declare_args() {
# Location of the Tizen SDK.
tizen_sdk_root = ""
}

chip_device_platform = "tizen"

chip_build_tests = false
Expand Down
4 changes: 1 addition & 3 deletions examples/light-switch-app/efr32/args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ import("${chip_root}/src/platform/EFR32/args.gni")

efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")

declare_args() {
chip_enable_ota_requestor = true
}
chip_enable_ota_requestor = true

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log"
Expand Down
9 changes: 4 additions & 5 deletions examples/lighting-app/bouffalolab/bl602/args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log"

chip_enable_openthread = false
declare_args() {
# Disable lock tracking, since our FreeRTOS configuration does not set
# INCLUDE_xSemaphoreGetMutexHolder
chip_stack_lock_tracking = "none"
}

# Disable lock tracking, since our FreeRTOS configuration does not set
# INCLUDE_xSemaphoreGetMutexHolder
chip_stack_lock_tracking = "none"
4 changes: 1 addition & 3 deletions examples/lighting-app/efr32/args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ import("${chip_root}/src/platform/EFR32/args.gni")

efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")

declare_args() {
chip_enable_ota_requestor = true
}
chip_enable_ota_requestor = true

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log"
Expand Down
8 changes: 3 additions & 5 deletions examples/lighting-app/nxp/k32w/k32w0/args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ import("${chip_root}/examples/platform/nxp/k32w/k32w0/args.gni")
# SDK target. This is overridden to add our SDK app_config.h & defines.
k32w0_sdk_target = get_label_info(":sdk", "label_no_toolchain")

declare_args() {
chip_enable_ota_requestor = true
chip_stack_lock_tracking = "fatal"
chip_enable_ble = true
}
chip_enable_ota_requestor = true
chip_stack_lock_tracking = "fatal"
chip_enable_ble = true
12 changes: 5 additions & 7 deletions examples/lighting-app/qpg/args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ import("${chip_root}/examples/platform/qpg/args.gni")

qpg_sdk_target = get_label_info(":sdk", "label_no_toolchain")

declare_args() {
chip_enable_ota_requestor = true
chip_openthread_ftd = true
chip_enable_ota_requestor = true
chip_openthread_ftd = true

# Disable lock tracking, since our FreeRTOS configuration does not set
# INCLUDE_xSemaphoreGetMutexHolder
chip_stack_lock_tracking = "none"
}
# Disable lock tracking, since our FreeRTOS configuration does not set
# INCLUDE_xSemaphoreGetMutexHolder
chip_stack_lock_tracking = "none"

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log"
4 changes: 1 addition & 3 deletions examples/lock-app/efr32/args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ import("${chip_root}/src/platform/EFR32/args.gni")

efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")

declare_args() {
chip_enable_ota_requestor = true
}
chip_enable_ota_requestor = true

chip_enable_openthread = true
pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
Expand Down
6 changes: 2 additions & 4 deletions examples/lock-app/nxp/k32w/k32w0/args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,5 @@ import("${chip_root}/examples/platform/nxp/k32w/k32w0/args.gni")
# SDK target. This is overridden to add our SDK app_config.h & defines.
k32w0_sdk_target = get_label_info(":sdk", "label_no_toolchain")

declare_args() {
chip_stack_lock_tracking = "fatal"
chip_enable_ble = true
}
chip_stack_lock_tracking = "fatal"
chip_enable_ble = true
12 changes: 5 additions & 7 deletions examples/lock-app/qpg/args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ import("${chip_root}/examples/platform/qpg/args.gni")

qpg_sdk_target = get_label_info(":sdk", "label_no_toolchain")

declare_args() {
chip_enable_ota_requestor = true
chip_openthread_ftd = false
chip_enable_ota_requestor = true
chip_openthread_ftd = false

# Disable lock tracking, since our FreeRTOS configuration does not set
# INCLUDE_xSemaphoreGetMutexHolder
chip_stack_lock_tracking = "none"
}
# Disable lock tracking, since our FreeRTOS configuration does not set
# INCLUDE_xSemaphoreGetMutexHolder
chip_stack_lock_tracking = "none"

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log"
4 changes: 1 addition & 3 deletions examples/ota-requestor-app/cyw30739/args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,4 @@ chip_openthread_ftd = true
chip_progress_logging = false
chip_error_logging = false

declare_args() {
chip_enable_ota_requestor = true
}
chip_enable_ota_requestor = true
4 changes: 1 addition & 3 deletions examples/ota-requestor-app/efr32/args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,4 @@ chip_openthread_ftd = false
# Example will not be maintained in the long term and will be depraceted now that OTA is beeing intagrated into our examples
chip_stack_lock_tracking = "None"

declare_args() {
chip_enable_ota_requestor = true
}
chip_enable_ota_requestor = true
4 changes: 1 addition & 3 deletions examples/ota-requestor-app/linux/args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,4 @@ chip_project_config_include_dirs =
[ "${chip_root}/examples/ota-requestor-app/linux/include" ]
chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]

declare_args() {
chip_enable_ota_requestor = true
}
chip_enable_ota_requestor = true
4 changes: 1 addition & 3 deletions examples/ota-requestor-app/p6/args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ import("//build_overrides/chip.gni")
import("//build_overrides/pigweed.gni")
import("${chip_root}/src/platform/P6/args.gni")

declare_args() {
chip_enable_ota_requestor = true
}
chip_enable_ota_requestor = true

p6_target_project =
get_label_info(":ota_requestor_app_sdk_sources", "label_no_toolchain")
8 changes: 3 additions & 5 deletions examples/persistent-storage/qpg/args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ chip_with_lwip = true

lwip_debug = false

declare_args() {
# Disable lock tracking, since our FreeRTOS configuration does not set
# INCLUDE_xSemaphoreGetMutexHolder
chip_stack_lock_tracking = "none"
}
# Disable lock tracking, since our FreeRTOS configuration does not set
# INCLUDE_xSemaphoreGetMutexHolder
chip_stack_lock_tracking = "none"
4 changes: 1 addition & 3 deletions examples/shell/nxp/k32w/k32w0/args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,4 @@ import("${chip_root}/src/platform/nxp/k32w/k32w0/args.gni")

k32w0_sdk_target = get_label_info(":sdk", "label_no_toolchain")

declare_args() {
chip_enable_ble = true
}
chip_enable_ble = true
6 changes: 2 additions & 4 deletions examples/window-app/efr32/args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@ import("${chip_root}/src/platform/EFR32/args.gni")

efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")

declare_args() {
# TODO fix me
chip_enable_ota_requestor = false
}
# TODO fix me
chip_enable_ota_requestor = false

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log"
Expand Down