Skip to content

Commit 27a478f

Browse files
authored
Add 3 more headers from ember src/app/util to be known to gn (#32622)
* Add 3 more headers from ember to be known to gn * Restyle * Fix lint
1 parent 4726936 commit 27a478f

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

.github/workflows/lint.yml

-3
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,8 @@ jobs:
101101
--known-failure app/reporting/tests/MockReportScheduler.h \
102102
--known-failure app/TestEventTriggerDelegate.h \
103103
--known-failure app/util/af.h \
104-
--known-failure app/util/af-types.h \
105104
--known-failure app/util/attribute-storage.cpp \
106105
--known-failure app/util/attribute-storage.h \
107-
--known-failure app/util/attribute-storage-null-handling.h \
108106
--known-failure app/util/attribute-table.cpp \
109107
--known-failure app/util/attribute-table.h \
110108
--known-failure app/util/binding-table.cpp \
@@ -118,7 +116,6 @@ jobs:
118116
--known-failure app/util/generic-callback-stubs.cpp \
119117
--known-failure app/util/im-client-callbacks.h \
120118
--known-failure app/util/MatterCallbacks.h \
121-
--known-failure app/util/odd-sized-integers.h \
122119
--known-failure app/util/util.cpp \
123120
--known-failure app/util/util.h \
124121
--known-failure app/WriteHandler.h \

src/app/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ static_library("interaction-model") {
202202
"${chip_root}/src/app/MessageDef",
203203
"${chip_root}/src/app/icd/server:icd-server-config",
204204
"${chip_root}/src/app/icd/server:observer",
205+
"${chip_root}/src/app/util:af-types",
205206
"${chip_root}/src/lib/address_resolve",
206207
"${chip_root}/src/lib/support",
207208
"${chip_root}/src/lib/support:static-support",

src/app/util/BUILD.gn

+16
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,38 @@
1515
import("//build_overrides/chip.gni")
1616
import("${chip_root}/src/app/common_flags.gni")
1717

18+
# These headers/cpp only depend on core/common
1819
source_set("types") {
1920
sources = [
2021
"att-storage.h",
2122
"attribute-metadata.cpp",
2223
"attribute-metadata.h",
24+
"attribute-storage-null-handling.h",
2325
"basic-types.h",
2426
"ember-strings.cpp",
2527
"ember-strings.h",
2628
"endpoint-config-defines.h",
29+
"odd-sized-integers.h",
2730
"types_stub.h",
2831
]
2932

3033
deps = [
3134
"${chip_root}/src/app/common:attribute-type",
35+
"${chip_root}/src/lib/core",
3236
"${chip_root}/src/lib/core:encoding",
3337
"${chip_root}/src/lib/core:types",
3438
]
3539
public_configs = [ "${chip_root}/src:includes" ]
3640
}
41+
42+
# This source set also depends on data-model
43+
source_set("af-types") {
44+
sources = [ "af-types.h" ]
45+
deps = [
46+
":types",
47+
"${chip_root}/src/app:paths",
48+
"${chip_root}/src/app/data-model",
49+
"${chip_root}/src/messaging",
50+
"${chip_root}/src/protocols/interaction_model",
51+
]
52+
}

0 commit comments

Comments
 (0)