Skip to content

Commit 6a5d4fa

Browse files
authored
[FIX] Reverting project-chip#40017 And Changing Camera App Target Parameter (project-chip#40257)
* Fixing chip-cert-bins build by changing the Dockerfile to use Clang for the camera app Also removing the -Wconversion flag from the camera app and controller * Revert "Enable NFC-based commissioning by default in chip-tool (project-chip#40017)" This reverts commit 17bc500.
1 parent 0d6af0f commit 6a5d4fa

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed

examples/camera-app/linux/BUILD.gn

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@ import("${build_root}/config/linux/pkg_config.gni")
2222
assert(chip_build_tools)
2323

2424
config("config") {
25-
cflags = [
26-
"-Wconversion",
27-
"-Wno-shadow",
28-
]
25+
cflags = [ "-Wno-shadow" ]
2926

3027
if (is_clang) {
3128
# libdatachannel has a lot of these like:

examples/camera-controller/BUILD.gn

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ import("${chip_root}/src/lib/core/core.gni")
2525
assert(chip_build_tools)
2626

2727
config("config") {
28-
cflags = [
29-
"-Wconversion",
30-
"-Wno-shadow",
31-
]
28+
cflags = [ "-Wno-shadow" ]
3229

3330
if (is_clang) {
3431
# libdatachannel has a lot of these like:

integrations/docker/images/chip-cert-bins/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ RUN case ${TARGETPLATFORM} in \
156156
set -x \
157157
&& source scripts/activate.sh \
158158
&& scripts/build/build_examples.py \
159-
--target linux-x64-chip-tool-ipv6only-platform-mdns-nfc-commission \
159+
--target linux-x64-chip-tool-ipv6only-platform-mdns \
160160
--target linux-x64-shell-ipv6only-platform-mdns \
161161
--target linux-x64-chip-cert-ipv6only-platform-mdns \
162162
--target linux-x64-air-purifier-ipv6only \
@@ -186,7 +186,7 @@ RUN case ${TARGETPLATFORM} in \
186186
--target linux-x64-camera-ipv6only \
187187
--target linux-x64-camera-controller-ipv6only \
188188
build \
189-
&& mv out/linux-x64-chip-tool-ipv6only-platform-mdns-nfc-commission/chip-tool out/chip-tool \
189+
&& mv out/linux-x64-chip-tool-ipv6only-platform-mdns/chip-tool out/chip-tool \
190190
&& mv out/linux-x64-shell-ipv6only-platform-mdns/chip-shell out/chip-shell \
191191
&& mv out/linux-x64-chip-cert-ipv6only-platform-mdns/chip-cert out/chip-cert \
192192
&& mv out/linux-x64-air-purifier-ipv6only/chip-air-purifier-app out/chip-air-purifier-app \
@@ -220,7 +220,7 @@ RUN case ${TARGETPLATFORM} in \
220220
set -x \
221221
&& source scripts/activate.sh \
222222
&& scripts/build/build_examples.py \
223-
--target linux-arm64-chip-tool-ipv6only-platform-mdns-nfc-commission \
223+
--target linux-arm64-chip-tool-ipv6only-platform-mdns \
224224
--target linux-arm64-shell-ipv6only-platform-mdns \
225225
--target linux-arm64-chip-cert-ipv6only-platform-mdns \
226226
--target linux-arm64-air-purifier-ipv6only \
@@ -247,10 +247,10 @@ RUN case ${TARGETPLATFORM} in \
247247
--target linux-arm64-network-manager-ipv6only \
248248
--target linux-arm64-terms-and-conditions-ipv6only \
249249
--target linux-arm64-water-leak-detector-ipv6only \
250-
--target linux-arm64-camera-ipv6only \
250+
--target linux-arm64-camera-clang-ipv6only \
251251
--target linux-arm64-camera-controller-ipv6only \
252252
build \
253-
&& mv out/linux-arm64-chip-tool-ipv6only-platform-mdns-nfc-commission/chip-tool out/chip-tool \
253+
&& mv out/linux-arm64-chip-tool-ipv6only-platform-mdns/chip-tool out/chip-tool \
254254
&& mv out/linux-arm64-shell-ipv6only-platform-mdns/chip-shell out/chip-shell \
255255
&& mv out/linux-arm64-chip-cert-ipv6only-platform-mdns/chip-cert out/chip-cert \
256256
&& mv out/linux-arm64-air-purifier-ipv6only/chip-air-purifier-app out/chip-air-purifier-app \
@@ -277,7 +277,7 @@ RUN case ${TARGETPLATFORM} in \
277277
&& mv out/linux-arm64-network-manager-ipv6only/matter-network-manager-app out/matter-network-manager-app \
278278
&& mv out/linux-arm64-terms-and-conditions-ipv6only/chip-terms-and-conditions-app out/chip-terms-and-conditions-app \
279279
&& mv out/linux-arm64-water-leak-detector-ipv6only/water-leak-detector-app out/water-leak-detector-app \
280-
&& mv out/linux-arm64-camera-ipv6only/chip-camera-app out/chip-camera-app \
280+
&& mv out/linux-arm64-camera-clang-ipv6only/chip-camera-app out/chip-camera-app \
281281
&& mv out/linux-arm64-camera-controller-ipv6only/chip-camera-controller out/chip-camera-controller \
282282
;; \
283283
*) ;; \

0 commit comments

Comments
 (0)