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 zap_pregenerated_dir from the chip_data_model GN template #32272

Merged
merged 1 commit into from
Feb 22, 2024
Merged

remove zap_pregenerated_dir from the chip_data_model GN template #32272

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
3 changes: 0 additions & 3 deletions examples/air-purifier-app/air-purifier-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("air-purifier-common") {
zap_file = "air-purifier-app.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/air-purifier-app/zap-generated"
is_server = true
}
3 changes: 0 additions & 3 deletions examples/air-quality-sensor-app/air-quality-sensor-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("air-quality-sensor-common") {
zap_file = "air-quality-sensor-app.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/air-quality-sensor-app/zap-generated"
is_server = true
}
3 changes: 0 additions & 3 deletions examples/all-clusters-app/all-clusters-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("all-clusters-common") {
zap_file = "all-clusters-app.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/all-clusters-app/zap-generated"
is_server = true
}
3 changes: 0 additions & 3 deletions examples/all-clusters-minimal-app/all-clusters-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("all-clusters-common") {
zap_file = "all-clusters-minimal-app.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/all-clusters-minimal-app/zap-generated"
is_server = true
}
1 change: 0 additions & 1 deletion examples/bridge-app/bridge-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import("${chip_root}/src/app/chip_data_model.gni")
chip_data_model("bridge-common") {
zap_file = "bridge-app.zap"

zap_pregenerated_dir = "${chip_root}/zzz_generated/bridge-app/zap-generated"
is_server = true

# TODO: the definition of DYNAMIC_ENDPOINT_COUNT needs find a common home!
Expand Down
2 changes: 0 additions & 2 deletions examples/chef/linux/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ project_dir = "./.."

chip_data_model("chef-data-model") {
zap_file = "${project_dir}/devices/${sample_zap_file}"
zap_pregenerated_dir =
"${chip_root}/examples/chef/out/${sample_name}/zap-generated/"
is_server = true
}

Expand Down
2 changes: 0 additions & 2 deletions examples/chef/silabs/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ declare_args() {

chip_data_model("chef-common") {
zap_file = "${chef_project_dir}/devices/${sample_name}.zap"

zap_pregenerated_dir = "${chef_project_dir}/out/${sample_name}/zap-generated/"
is_server = true
}

Expand Down
3 changes: 0 additions & 3 deletions examples/contact-sensor-app/contact-sensor-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("contact-sensor-common") {
zap_file = "contact-sensor-app.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/contact-sensor-app/zap-generated"
is_server = true
}
3 changes: 0 additions & 3 deletions examples/contact-sensor-app/nxp/zap-lit/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("zap-lit") {
zap_file = "contact-sensor-app.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/contact-sensor-app/nxp/zap-generated"
is_server = true
}
3 changes: 0 additions & 3 deletions examples/contact-sensor-app/nxp/zap-sit/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("zap-sit") {
zap_file = "contact-sensor-app.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/contact-sensor-app/nxp/zap-generated"
is_server = true
}
3 changes: 0 additions & 3 deletions examples/dishwasher-app/dishwasher-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,5 @@ config("config") {

chip_data_model("dishwasher-common") {
zap_file = "dishwasher-app.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/dishwasher-app/zap-generated"
is_server = true
}
3 changes: 0 additions & 3 deletions examples/energy-management-app/energy-management-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,5 @@ config("config") {

chip_data_model("energy-management-common") {
zap_file = "energy-management-app.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/energy-management-app/zap-generated"
is_server = true
}
4 changes: 0 additions & 4 deletions examples/light-switch-app/light-switch-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("light-switch-common") {
zap_file = "light-switch-app.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/light-switch-app/zap-generated"

is_server = true
}
3 changes: 0 additions & 3 deletions examples/light-switch-app/qpg/zap/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("zap") {
zap_file = "switch.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/light-switch-app/qpg/zap-generated"
is_server = true
}
2 changes: 0 additions & 2 deletions examples/lighting-app/bouffalolab/bl602/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@ bl_iot_sdk("sdk") {

chip_data_model("bouffalolab-lighting") {
zap_file = "${example_dir}/data_model/lighting-app-wifi.zap"

zap_pregenerated_dir = "${chip_root}/zzz_generated/lighting-app/zap-generated"
is_server = true
}

Expand Down
2 changes: 0 additions & 2 deletions examples/lighting-app/bouffalolab/bl702/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,6 @@ chip_data_model("bouffalolab-lighting") {
} else {
zap_file = "${example_dir}/data_model/lighting-app-ethernet.zap"
}

zap_pregenerated_dir = "${chip_root}/zzz_generated/lighting-app/zap-generated"
is_server = true
}

Expand Down
2 changes: 0 additions & 2 deletions examples/lighting-app/bouffalolab/bl702l/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ bl_iot_sdk("sdk") {

chip_data_model("bouffalolab-lighting") {
zap_file = "${example_dir}/data_model/lighting-app-thread.zap"

zap_pregenerated_dir = "${chip_root}/zzz_generated/lighting-app/zap-generated"
is_server = true
}

Expand Down
2 changes: 0 additions & 2 deletions examples/lighting-app/lighting-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ config("config") {

chip_data_model("lighting-common") {
zap_file = "lighting-app.zap"

zap_pregenerated_dir = "${chip_root}/zzz_generated/lighting-app/zap-generated"
is_server = true
}

Expand Down
3 changes: 0 additions & 3 deletions examples/lighting-app/nxp/zap/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("zap") {
zap_file = "lighting-on-off.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/lighting-app/nxp/zap-generated"
is_server = true
}
3 changes: 0 additions & 3 deletions examples/lighting-app/qpg/zap/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("zap") {
zap_file = "light.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/lighting-app/qpg/zap-generated"
is_server = true
}
2 changes: 0 additions & 2 deletions examples/lighting-app/silabs/data_model/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,5 @@ chip_data_model("silabs-lighting") {
} else {
zap_file = "lighting-thread-app.zap"
}

zap_pregenerated_dir = "${chip_root}/zzz_generated/lighting-app/zap-generated"
is_server = true
}
3 changes: 0 additions & 3 deletions examples/lit-icd-app/lit-icd-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("lit-icd-common") {
zap_file = "lit-icd-server-app.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/lit-icd-server-app/zap-generated"
is_server = true
}
2 changes: 0 additions & 2 deletions examples/lock-app/lock-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("lock-common") {
zap_file = "lock-app.zap"

zap_pregenerated_dir = "${chip_root}/zzz_generated/lock-app/zap-generated"
is_server = true
}

Expand Down
2 changes: 0 additions & 2 deletions examples/lock-app/nxp/zap/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("zap") {
zap_file = "lock-app.zap"

zap_pregenerated_dir = "${chip_root}/zzz_generated/lock-app/nxp/zap-generated"
is_server = true
}
2 changes: 0 additions & 2 deletions examples/lock-app/qpg/zap/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("zap") {
zap_file = "lock.zap"

zap_pregenerated_dir = "${chip_root}/zzz_generated/lock-app/qpg/zap-generated"
is_server = true
}
3 changes: 0 additions & 3 deletions examples/log-source-app/log-source-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ config("config") {
chip_data_model("log-source-common") {
zap_file = "log-source-app.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/log-source-app/zap-generated"

deps = [ "${chip_root}/src/protocols/bdx" ]

is_server = true
Expand Down
3 changes: 0 additions & 3 deletions examples/microwave-oven-app/microwave-oven-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,5 @@ config("config") {

chip_data_model("microwave-oven-common") {
zap_file = "microwave-oven-app.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/microwave-oven-app/zap-generated"
is_server = true
}
3 changes: 0 additions & 3 deletions examples/network-manager-app/network-manager-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("network-manager-common") {
zap_file = "network-manager-app.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/network-manager-app/zap-generated"
is_server = true
}
3 changes: 0 additions & 3 deletions examples/ota-provider-app/ota-provider-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ config("config") {
chip_data_model("ota-provider-common") {
zap_file = "ota-provider-app.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/ota-provider-app/zap-generated"

sources = [
"BdxOtaSender.cpp",
"BdxOtaSender.h",
Expand Down
3 changes: 0 additions & 3 deletions examples/ota-requestor-app/ota-requestor-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ config("config") {
chip_data_model("ota-requestor-common") {
zap_file = "ota-requestor-app.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/ota-requestor-app/zap-generated"

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

public_configs = [ ":config" ]
Expand Down
3 changes: 0 additions & 3 deletions examples/placeholder/linux/apps/app1/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("configuration") {
zap_file = "config.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/placeholder/app1/zap-generated"
is_server = true
}

Expand Down
3 changes: 0 additions & 3 deletions examples/placeholder/linux/apps/app2/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("configuration") {
zap_file = "config.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/placeholder/app2/zap-generated"
is_server = true
}

Expand Down
2 changes: 0 additions & 2 deletions examples/pump-app/pump-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("pump-common") {
zap_file = "pump-app.zap"

zap_pregenerated_dir = "${chip_root}/zzz_generated/pump-app/zap-generated"
is_server = true
}
2 changes: 0 additions & 2 deletions examples/pump-app/silabs/data_model/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,5 @@ chip_data_model("silabs-pump") {
} else {
zap_file = "pump-thread-app.zap"
}

zap_pregenerated_dir = "${chip_root}/zzz_generated/pump-app/zap-generated"
is_server = true
}
3 changes: 0 additions & 3 deletions examples/pump-controller-app/pump-controller-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("pump-controller-common") {
zap_file = "pump-controller-app.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/pump-controller-app/zap-generated"
is_server = true
}
3 changes: 0 additions & 3 deletions examples/refrigerator-app/refrigerator-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,5 @@ config("config") {

chip_data_model("refrigerator-common") {
zap_file = "refrigerator-app.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/refrigerator-app/zap-generated"
is_server = true
}
2 changes: 0 additions & 2 deletions examples/rvc-app/rvc-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,5 @@ config("config") {

chip_data_model("rvc-common") {
zap_file = "rvc-app.zap"

zap_pregenerated_dir = "${chip_root}/zzz_generated/rvc-app/zap-generated"
is_server = true
}
3 changes: 0 additions & 3 deletions examples/smoke-co-alarm-app/smoke-co-alarm-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("smoke-co-alarm-common") {
zap_file = "smoke-co-alarm-app.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/smoke-co-alarm-app/zap-generated"
is_server = true
}
3 changes: 0 additions & 3 deletions examples/temperature-measurement-app/temperature-measurement-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("temperature-measurement-common") {
zap_file = "temperature-measurement.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/temperature-measurement/zap-generated"
is_server = true
}
2 changes: 0 additions & 2 deletions examples/thermostat/nxp/zap/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,5 @@ chip_data_model("zap") {
zap_file = "thermostat_matter_thread.zap"
}

# Defining zap_pregenerated_dir is required by chip_data_model.gni in order to build IMClusterCommandHandler.cpp
zap_pregenerated_dir = ""
is_server = true
}
3 changes: 0 additions & 3 deletions examples/thermostat/qpg/zap/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("zap") {
zap_file = "thermostaticRadiatorValve.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/thermostat/qpg/zap-generated"
is_server = true
}
2 changes: 0 additions & 2 deletions examples/thermostat/thermostat-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("thermostat-common") {
zap_file = "thermostat.zap"

zap_pregenerated_dir = "${chip_root}/zzz_generated/thermostat/zap-generated"
is_server = true
}
2 changes: 0 additions & 2 deletions examples/tv-app/tv-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ import("${chip_root}/src/lib/lib.gni")

chip_data_model("tv-common") {
zap_file = "tv-app.zap"

zap_pregenerated_dir = "${chip_root}/zzz_generated/tv-app/zap-generated"
is_server = true
}

Expand Down
3 changes: 0 additions & 3 deletions examples/tv-casting-app/tv-casting-common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ config("config") {
chip_data_model("tv-casting-common") {
zap_file = "tv-casting-app.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/tv-casting-app/zap-generated"

sources = [
"${chip_root}/examples/chip-tool/commands/clusters/ModelCommand.h",
"${chip_root}/examples/chip-tool/commands/common/BDXDiagnosticLogsServerDelegate.cpp",
Expand Down
Loading
Loading