Skip to content

Commit f212759

Browse files
committed
Fix the Build Flags Conflict
1 parent 5adee57 commit f212759

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

examples/camera-app/linux/BUILD.gn

+11-12
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,26 @@ import("//build_overrides/build.gni")
1616
import("//build_overrides/chip.gni")
1717

1818
import("${chip_root}/build/chip/tools.gni")
19-
import("${chip_root}/src/app/common_flags.gni")
2019

2120
assert(chip_build_tools)
2221

23-
config("includes") {
22+
config("config") {
23+
cflags = [
24+
"-Wconversion",
25+
"-Wno-shadow",
26+
]
27+
2428
include_dirs = [
25-
".",
2629
"include",
30+
"include/clusters/chime",
31+
"${chip_root}/examples/camera-app/camera-common/include",
32+
"${chip_root}/third_party/libdatachannel/repo/include",
2733
]
2834
}
2935

3036
executable("chip-camera-app") {
37+
configs += [ ":config" ]
38+
3139
sources = [
3240
"${chip_root}/examples/camera-app/linux/src/camera-device.cpp",
3341
"${chip_root}/examples/camera-app/linux/src/clusters/chime/chime-manager.cpp",
@@ -47,15 +55,6 @@ executable("chip-camera-app") {
4755
lib_dirs =
4856
[ rebase_path("${chip_root}/third_party/libdatachannel/repo/build") ]
4957

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-
5958
output_dir = root_out_dir
6059
}
6160

examples/camera-controller/BUILD.gn

+6-2
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,18 @@ import("${chip_root}/src/lib/core/core.gni")
2323
assert(chip_build_tools)
2424

2525
config("config") {
26+
cflags = [
27+
"-Wconversion",
28+
"-Wno-shadow",
29+
]
30+
2631
include_dirs = [
2732
".",
2833
"${chip_root}/examples/common",
2934
"${chip_root}/zzz_generated/app-common/app-common",
3035
"${chip_root}/zzz_generated/chip-tool",
3136
"${chip_root}/src/lib",
37+
"${chip_root}/third_party/libdatachannel/repo/include",
3238
]
3339

3440
defines = [ "CONFIG_USE_SEPARATE_EVENTLOOP=${config_use_separate_eventloop}" ]
@@ -114,8 +120,6 @@ executable("camera-controller") {
114120
lib_dirs =
115121
[ rebase_path("${chip_root}/third_party/libdatachannel/repo/build") ]
116122

117-
include_dirs = [ "${chip_root}/third_party/libdatachannel/repo/include" ]
118-
119123
output_dir = root_out_dir
120124
}
121125

0 commit comments

Comments
 (0)