Commit f212759 1 parent 5adee57 commit f212759 Copy full SHA for f212759
File tree 2 files changed +17
-14
lines changed
2 files changed +17
-14
lines changed Original file line number Diff line number Diff line change @@ -16,18 +16,26 @@ import("//build_overrides/build.gni")
16
16
import (" //build_overrides/chip.gni" )
17
17
18
18
import (" ${ chip_root } /build/chip/tools.gni" )
19
- import (" ${ chip_root } /src/app/common_flags.gni" )
20
19
21
20
assert (chip_build_tools )
22
21
23
- config (" includes" ) {
22
+ config (" config" ) {
23
+ cflags = [
24
+ " -Wconversion" ,
25
+ " -Wno-shadow" ,
26
+ ]
27
+
24
28
include_dirs = [
25
- " ." ,
26
29
" include" ,
30
+ " include/clusters/chime" ,
31
+ " ${ chip_root } /examples/camera-app/camera-common/include" ,
32
+ " ${ chip_root } /third_party/libdatachannel/repo/include" ,
27
33
]
28
34
}
29
35
30
36
executable (" chip-camera-app" ) {
37
+ configs += [ " :config" ]
38
+
31
39
sources = [
32
40
" ${ chip_root } /examples/camera-app/linux/src/camera-device.cpp" ,
33
41
" ${ chip_root } /examples/camera-app/linux/src/clusters/chime/chime-manager.cpp" ,
@@ -47,15 +55,6 @@ executable("chip-camera-app") {
47
55
lib_dirs =
48
56
[ rebase_path (" ${ chip_root } /third_party/libdatachannel/repo/build" ) ]
49
57
50
- include_dirs = [
51
- " include" ,
52
- " include/clusters/chime" ,
53
- " ${ chip_root } /examples/camera-app/camera-common/include" ,
54
- " ${ chip_root } /third_party/libdatachannel/repo/include" ,
55
- ]
56
-
57
- cflags = [ " -Wconversion" ]
58
-
59
58
output_dir = root_out_dir
60
59
}
61
60
Original file line number Diff line number Diff line change @@ -23,12 +23,18 @@ import("${chip_root}/src/lib/core/core.gni")
23
23
assert (chip_build_tools )
24
24
25
25
config (" config" ) {
26
+ cflags = [
27
+ " -Wconversion" ,
28
+ " -Wno-shadow" ,
29
+ ]
30
+
26
31
include_dirs = [
27
32
" ." ,
28
33
" ${ chip_root } /examples/common" ,
29
34
" ${ chip_root } /zzz_generated/app-common/app-common" ,
30
35
" ${ chip_root } /zzz_generated/chip-tool" ,
31
36
" ${ chip_root } /src/lib" ,
37
+ " ${ chip_root } /third_party/libdatachannel/repo/include" ,
32
38
]
33
39
34
40
defines = [ " CONFIG_USE_SEPARATE_EVENTLOOP=${ config_use_separate_eventloop } " ]
@@ -114,8 +120,6 @@ executable("camera-controller") {
114
120
lib_dirs =
115
121
[ rebase_path (" ${ chip_root } /third_party/libdatachannel/repo/build" ) ]
116
122
117
- include_dirs = [ " ${ chip_root } /third_party/libdatachannel/repo/include" ]
118
-
119
123
output_dir = root_out_dir
120
124
}
121
125
You can’t perform that action at this time.
0 commit comments