Skip to content

Commit 7e3774e

Browse files
zap pregenerated dir does not exist anymore at all. zzz_generated is mostly empty (#32272)
Co-authored-by: Andrei Litvin <andreilitvin@google.com>
1 parent f2bdd1f commit 7e3774e

File tree

48 files changed

+1
-158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1
-158
lines changed

examples/air-purifier-app/air-purifier-common/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
1717

1818
chip_data_model("air-purifier-common") {
1919
zap_file = "air-purifier-app.zap"
20-
21-
zap_pregenerated_dir =
22-
"${chip_root}/zzz_generated/air-purifier-app/zap-generated"
2320
is_server = true
2421
}

examples/air-quality-sensor-app/air-quality-sensor-common/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
1717

1818
chip_data_model("air-quality-sensor-common") {
1919
zap_file = "air-quality-sensor-app.zap"
20-
21-
zap_pregenerated_dir =
22-
"${chip_root}/zzz_generated/air-quality-sensor-app/zap-generated"
2320
is_server = true
2421
}

examples/all-clusters-app/all-clusters-common/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
1818

1919
chip_data_model("all-clusters-common") {
2020
zap_file = "all-clusters-app.zap"
21-
22-
zap_pregenerated_dir =
23-
"${chip_root}/zzz_generated/all-clusters-app/zap-generated"
2421
is_server = true
2522
}

examples/all-clusters-minimal-app/all-clusters-common/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
1818

1919
chip_data_model("all-clusters-common") {
2020
zap_file = "all-clusters-minimal-app.zap"
21-
22-
zap_pregenerated_dir =
23-
"${chip_root}/zzz_generated/all-clusters-minimal-app/zap-generated"
2421
is_server = true
2522
}

examples/bridge-app/bridge-common/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import("${chip_root}/src/app/chip_data_model.gni")
1919
chip_data_model("bridge-common") {
2020
zap_file = "bridge-app.zap"
2121

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

2524
# TODO: the definition of DYNAMIC_ENDPOINT_COUNT needs find a common home!

examples/chef/linux/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ project_dir = "./.."
3535

3636
chip_data_model("chef-data-model") {
3737
zap_file = "${project_dir}/devices/${sample_zap_file}"
38-
zap_pregenerated_dir =
39-
"${chip_root}/examples/chef/out/${sample_name}/zap-generated/"
4038
is_server = true
4139
}
4240

examples/chef/silabs/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ declare_args() {
4848

4949
chip_data_model("chef-common") {
5050
zap_file = "${chef_project_dir}/devices/${sample_name}.zap"
51-
52-
zap_pregenerated_dir = "${chef_project_dir}/out/${sample_name}/zap-generated/"
5351
is_server = true
5452
}
5553

examples/contact-sensor-app/contact-sensor-common/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
1717

1818
chip_data_model("contact-sensor-common") {
1919
zap_file = "contact-sensor-app.zap"
20-
21-
zap_pregenerated_dir =
22-
"${chip_root}/zzz_generated/contact-sensor-app/zap-generated"
2320
is_server = true
2421
}

examples/contact-sensor-app/nxp/zap-lit/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
1818

1919
chip_data_model("zap-lit") {
2020
zap_file = "contact-sensor-app.zap"
21-
22-
zap_pregenerated_dir =
23-
"${chip_root}/zzz_generated/contact-sensor-app/nxp/zap-generated"
2421
is_server = true
2522
}

examples/contact-sensor-app/nxp/zap-sit/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
1818

1919
chip_data_model("zap-sit") {
2020
zap_file = "contact-sensor-app.zap"
21-
22-
zap_pregenerated_dir =
23-
"${chip_root}/zzz_generated/contact-sensor-app/nxp/zap-generated"
2421
is_server = true
2522
}

examples/dishwasher-app/dishwasher-common/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,5 @@ config("config") {
2121

2222
chip_data_model("dishwasher-common") {
2323
zap_file = "dishwasher-app.zap"
24-
25-
zap_pregenerated_dir =
26-
"${chip_root}/zzz_generated/dishwasher-app/zap-generated"
2724
is_server = true
2825
}

examples/energy-management-app/energy-management-common/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,5 @@ config("config") {
2222

2323
chip_data_model("energy-management-common") {
2424
zap_file = "energy-management-app.zap"
25-
26-
zap_pregenerated_dir =
27-
"${chip_root}/zzz_generated/energy-management-app/zap-generated"
2825
is_server = true
2926
}

examples/light-switch-app/light-switch-common/BUILD.gn

-4
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
1717

1818
chip_data_model("light-switch-common") {
1919
zap_file = "light-switch-app.zap"
20-
21-
zap_pregenerated_dir =
22-
"${chip_root}/zzz_generated/light-switch-app/zap-generated"
23-
2420
is_server = true
2521
}

examples/light-switch-app/qpg/zap/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
1717

1818
chip_data_model("zap") {
1919
zap_file = "switch.zap"
20-
21-
zap_pregenerated_dir =
22-
"${chip_root}/zzz_generated/light-switch-app/qpg/zap-generated"
2320
is_server = true
2421
}

examples/lighting-app/bouffalolab/bl602/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@ bl_iot_sdk("sdk") {
9090

9191
chip_data_model("bouffalolab-lighting") {
9292
zap_file = "${example_dir}/data_model/lighting-app-wifi.zap"
93-
94-
zap_pregenerated_dir = "${chip_root}/zzz_generated/lighting-app/zap-generated"
9593
is_server = true
9694
}
9795

examples/lighting-app/bouffalolab/bl702/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,6 @@ chip_data_model("bouffalolab-lighting") {
122122
} else {
123123
zap_file = "${example_dir}/data_model/lighting-app-ethernet.zap"
124124
}
125-
126-
zap_pregenerated_dir = "${chip_root}/zzz_generated/lighting-app/zap-generated"
127125
is_server = true
128126
}
129127

examples/lighting-app/bouffalolab/bl702l/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@ bl_iot_sdk("sdk") {
9999

100100
chip_data_model("bouffalolab-lighting") {
101101
zap_file = "${example_dir}/data_model/lighting-app-thread.zap"
102-
103-
zap_pregenerated_dir = "${chip_root}/zzz_generated/lighting-app/zap-generated"
104102
is_server = true
105103
}
106104

examples/lighting-app/lighting-common/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ config("config") {
2121

2222
chip_data_model("lighting-common") {
2323
zap_file = "lighting-app.zap"
24-
25-
zap_pregenerated_dir = "${chip_root}/zzz_generated/lighting-app/zap-generated"
2624
is_server = true
2725
}
2826

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

-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
1818

1919
chip_data_model("zap") {
2020
zap_file = "lighting-on-off.zap"
21-
22-
zap_pregenerated_dir =
23-
"${chip_root}/zzz_generated/lighting-app/nxp/zap-generated"
2421
is_server = true
2522
}

examples/lighting-app/qpg/zap/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
1717

1818
chip_data_model("zap") {
1919
zap_file = "light.zap"
20-
21-
zap_pregenerated_dir =
22-
"${chip_root}/zzz_generated/lighting-app/qpg/zap-generated"
2320
is_server = true
2421
}

examples/lighting-app/silabs/data_model/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,5 @@ chip_data_model("silabs-lighting") {
2222
} else {
2323
zap_file = "lighting-thread-app.zap"
2424
}
25-
26-
zap_pregenerated_dir = "${chip_root}/zzz_generated/lighting-app/zap-generated"
2725
is_server = true
2826
}

examples/lit-icd-app/lit-icd-common/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
1717

1818
chip_data_model("lit-icd-common") {
1919
zap_file = "lit-icd-server-app.zap"
20-
21-
zap_pregenerated_dir =
22-
"${chip_root}/zzz_generated/lit-icd-server-app/zap-generated"
2320
is_server = true
2421
}

examples/lock-app/lock-common/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ import("${chip_root}/src/app/chip_data_model.gni")
1717

1818
chip_data_model("lock-common") {
1919
zap_file = "lock-app.zap"
20-
21-
zap_pregenerated_dir = "${chip_root}/zzz_generated/lock-app/zap-generated"
2220
is_server = true
2321
}
2422

examples/lock-app/nxp/zap/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
1717

1818
chip_data_model("zap") {
1919
zap_file = "lock-app.zap"
20-
21-
zap_pregenerated_dir = "${chip_root}/zzz_generated/lock-app/nxp/zap-generated"
2220
is_server = true
2321
}

examples/lock-app/qpg/zap/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
1717

1818
chip_data_model("zap") {
1919
zap_file = "lock.zap"
20-
21-
zap_pregenerated_dir = "${chip_root}/zzz_generated/lock-app/qpg/zap-generated"
2220
is_server = true
2321
}

examples/log-source-app/log-source-common/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ config("config") {
2323
chip_data_model("log-source-common") {
2424
zap_file = "log-source-app.zap"
2525

26-
zap_pregenerated_dir =
27-
"${chip_root}/zzz_generated/log-source-app/zap-generated"
28-
2926
deps = [ "${chip_root}/src/protocols/bdx" ]
3027

3128
is_server = true

examples/microwave-oven-app/microwave-oven-common/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,5 @@ config("config") {
2121

2222
chip_data_model("microwave-oven-common") {
2323
zap_file = "microwave-oven-app.zap"
24-
25-
zap_pregenerated_dir =
26-
"${chip_root}/zzz_generated/microwave-oven-app/zap-generated"
2724
is_server = true
2825
}

examples/network-manager-app/network-manager-common/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
1717

1818
chip_data_model("network-manager-common") {
1919
zap_file = "network-manager-app.zap"
20-
21-
zap_pregenerated_dir =
22-
"${chip_root}/zzz_generated/network-manager-app/zap-generated"
2320
is_server = true
2421
}

examples/ota-provider-app/ota-provider-common/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ config("config") {
2323
chip_data_model("ota-provider-common") {
2424
zap_file = "ota-provider-app.zap"
2525

26-
zap_pregenerated_dir =
27-
"${chip_root}/zzz_generated/ota-provider-app/zap-generated"
28-
2926
sources = [
3027
"BdxOtaSender.cpp",
3128
"BdxOtaSender.h",

examples/ota-requestor-app/ota-requestor-common/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ config("config") {
2323
chip_data_model("ota-requestor-common") {
2424
zap_file = "ota-requestor-app.zap"
2525

26-
zap_pregenerated_dir =
27-
"${chip_root}/zzz_generated/ota-requestor-app/zap-generated"
28-
2926
deps = [ "${chip_root}/src/lib" ]
3027

3128
public_configs = [ ":config" ]

examples/placeholder/linux/apps/app1/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ import("${chip_root}/src/app/chip_data_model.gni")
1717

1818
chip_data_model("configuration") {
1919
zap_file = "config.zap"
20-
21-
zap_pregenerated_dir =
22-
"${chip_root}/zzz_generated/placeholder/app1/zap-generated"
2320
is_server = true
2421
}
2522

examples/placeholder/linux/apps/app2/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ import("${chip_root}/src/app/chip_data_model.gni")
1717

1818
chip_data_model("configuration") {
1919
zap_file = "config.zap"
20-
21-
zap_pregenerated_dir =
22-
"${chip_root}/zzz_generated/placeholder/app2/zap-generated"
2320
is_server = true
2421
}
2522

examples/pump-app/pump-common/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
1818

1919
chip_data_model("pump-common") {
2020
zap_file = "pump-app.zap"
21-
22-
zap_pregenerated_dir = "${chip_root}/zzz_generated/pump-app/zap-generated"
2321
is_server = true
2422
}

examples/pump-app/silabs/data_model/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,5 @@ chip_data_model("silabs-pump") {
2222
} else {
2323
zap_file = "pump-thread-app.zap"
2424
}
25-
26-
zap_pregenerated_dir = "${chip_root}/zzz_generated/pump-app/zap-generated"
2725
is_server = true
2826
}

examples/pump-controller-app/pump-controller-common/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
1818

1919
chip_data_model("pump-controller-common") {
2020
zap_file = "pump-controller-app.zap"
21-
22-
zap_pregenerated_dir =
23-
"${chip_root}/zzz_generated/pump-controller-app/zap-generated"
2421
is_server = true
2522
}

examples/refrigerator-app/refrigerator-common/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,5 @@ config("config") {
2121

2222
chip_data_model("refrigerator-common") {
2323
zap_file = "refrigerator-app.zap"
24-
25-
zap_pregenerated_dir =
26-
"${chip_root}/zzz_generated/refrigerator-app/zap-generated"
2724
is_server = true
2825
}

examples/rvc-app/rvc-common/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,5 @@ config("config") {
2121

2222
chip_data_model("rvc-common") {
2323
zap_file = "rvc-app.zap"
24-
25-
zap_pregenerated_dir = "${chip_root}/zzz_generated/rvc-app/zap-generated"
2624
is_server = true
2725
}

examples/smoke-co-alarm-app/smoke-co-alarm-common/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
1717

1818
chip_data_model("smoke-co-alarm-common") {
1919
zap_file = "smoke-co-alarm-app.zap"
20-
21-
zap_pregenerated_dir =
22-
"${chip_root}/zzz_generated/smoke-co-alarm-app/zap-generated"
2320
is_server = true
2421
}

examples/temperature-measurement-app/temperature-measurement-common/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
1818

1919
chip_data_model("temperature-measurement-common") {
2020
zap_file = "temperature-measurement.zap"
21-
22-
zap_pregenerated_dir =
23-
"${chip_root}/zzz_generated/temperature-measurement/zap-generated"
2421
is_server = true
2522
}

examples/thermostat/nxp/zap/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,5 @@ chip_data_model("zap") {
2828
zap_file = "thermostat_matter_thread.zap"
2929
}
3030

31-
# Defining zap_pregenerated_dir is required by chip_data_model.gni in order to build IMClusterCommandHandler.cpp
32-
zap_pregenerated_dir = ""
3331
is_server = true
3432
}

examples/thermostat/qpg/zap/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
1717

1818
chip_data_model("zap") {
1919
zap_file = "thermostaticRadiatorValve.zap"
20-
21-
zap_pregenerated_dir =
22-
"${chip_root}/zzz_generated/thermostat/qpg/zap-generated"
2320
is_server = true
2421
}

examples/thermostat/thermostat-common/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,5 @@ import("${chip_root}/src/app/chip_data_model.gni")
1818

1919
chip_data_model("thermostat-common") {
2020
zap_file = "thermostat.zap"
21-
22-
zap_pregenerated_dir = "${chip_root}/zzz_generated/thermostat/zap-generated"
2321
is_server = true
2422
}

examples/tv-app/tv-common/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ import("${chip_root}/src/lib/lib.gni")
1919

2020
chip_data_model("tv-common") {
2121
zap_file = "tv-app.zap"
22-
23-
zap_pregenerated_dir = "${chip_root}/zzz_generated/tv-app/zap-generated"
2422
is_server = true
2523
}
2624

examples/tv-casting-app/tv-casting-common/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ config("config") {
3434
chip_data_model("tv-casting-common") {
3535
zap_file = "tv-casting-app.zap"
3636

37-
zap_pregenerated_dir =
38-
"${chip_root}/zzz_generated/tv-casting-app/zap-generated"
39-
4037
sources = [
4138
"${chip_root}/examples/chip-tool/commands/clusters/ModelCommand.h",
4239
"${chip_root}/examples/chip-tool/commands/common/BDXDiagnosticLogsServerDelegate.cpp",

0 commit comments

Comments
 (0)