Skip to content

Commit 28c78af

Browse files
authored
Define dependencies for some files in zzz_generated and compatenums.h (project-chip#32327)
* Add dependency on CompatEnumNames as this is a requirement and direct include of cluster-enums.h * define ids as a source set for zzz generated * Fix dependencies * CompatEnumNames is NOT in a subdirectory of app, which is wrong however for now roll with it * Move CompatEnumNames to common so linter catches it * Restyle
1 parent d12311a commit 28c78af

File tree

5 files changed

+17
-3
lines changed

5 files changed

+17
-3
lines changed

.github/workflows/lint.yml

-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ jobs:
9696
--known-failure app/CommandHandler.h \
9797
--known-failure app/CommandHandlerInterface.h \
9898
--known-failure app/CommandSenderLegacyCallback.h \
99-
--known-failure app/CompatEnumNames.h \
10099
--known-failure app/data-model/ListLargeSystemExtensions.h \
101100
--known-failure app/EventHeader.h \
102101
--known-failure app/EventLoggingTypes.h \

src/app/common/BUILD.gn

+15
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,19 @@ config("includes") {
1818
include_dirs = [ "${chip_root}/zzz_generated/app-common" ]
1919
}
2020

21+
source_set("ids") {
22+
sources = [
23+
"${chip_root}/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h",
24+
"${chip_root}/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h",
25+
"${chip_root}/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h",
26+
"${chip_root}/zzz_generated/app-common/app-common/zap-generated/ids/Events.h",
27+
]
28+
29+
public_deps = [ "${chip_root}/src/app/util:types" ]
30+
31+
public_configs = [ ":includes" ]
32+
}
33+
2134
static_library("cluster-objects") {
2235
output_name = "libClusterObjects"
2336

@@ -27,6 +40,7 @@ static_library("cluster-objects") {
2740
]
2841

2942
public_deps = [
43+
":ids",
3044
"${chip_root}/src/app:paths",
3145
"${chip_root}/src/app/data-model",
3246
"${chip_root}/src/app/util:types",
@@ -42,6 +56,7 @@ source_set("enums") {
4256
sources = [
4357
"${chip_root}/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h",
4458
"${chip_root}/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h",
59+
"CompatEnumNames.h",
4560
]
4661

4762
public_configs = [ ":includes" ]
File renamed without changes.

src/app/zap-templates/templates/app/cluster-enums.zapt

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,4 @@ k{{asUpperCamelCase label}} = {{asHex mask}},
7070
} // namespace chip
7171

7272
// Included at the end, so all our definitions above are available.
73-
#include <app/CompatEnumNames.h>
73+
#include <app/common/CompatEnumNames.h>

zzz_generated/app-common/app-common/zap-generated/cluster-enums.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)