Skip to content

Commit fb583bf

Browse files
committed
Merge remote-tracking branch 'upstream/master' into camera-webrtc-provider
2 parents 1ec905d + d404400 commit fb583bf

File tree

388 files changed

+5925
-3255
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

388 files changed

+5925
-3255
lines changed

.github/CODEOWNERS

-2
This file was deleted.

.github/workflows/darwin.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ jobs:
111111
working-directory: src/darwin/Framework
112112
run: |
113113
mkdir -p /tmp/darwin/framework-tests
114-
echo "This is a simple log" > /tmp/darwin/framework-tests/end_user_support_log.txt
115-
../../../out/debug/all-clusters-app/chip-all-clusters-app --interface-id -1 --end_user_support_log /tmp/darwin/framework-tests/end_user_support_log.txt > >(tee /tmp/darwin/framework-tests/all-cluster-app.log) 2> >(tee /tmp/darwin/framework-tests/all-cluster-app-err.log >&2) &
114+
../../../out/debug/all-clusters-app/chip-all-clusters-app --interface-id -1 > >(tee /tmp/darwin/framework-tests/all-cluster-app.log) 2> >(tee /tmp/darwin/framework-tests/all-cluster-app-err.log >&2) &
116115
117116
export TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1
118117

.github/workflows/docker_img.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
# ApplyLayer exit status 1 stdout: stderr: write /opt/fsl-imx-xwayland/5.15-kirkstone/sysroots/armv8a-poky-linux/opt/ltp/testcases/bin/fanotify15: no space left on device
102102
# - "-imx"
103103
- "-java"
104-
- "-k32w"
104+
- "-nxp"
105105
- "-nrf-platform"
106106
- "-telink"
107107
- "-ti"

.github/workflows/examples-nxp.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
if: github.actor != 'restyled-io[bot]'
4040

4141
container:
42-
image: ghcr.io/project-chip/chip-build-k32w:80
42+
image: ghcr.io/project-chip/chip-build-nxp:80
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545
steps:

.pullapprove.yml

+19-19
Original file line numberDiff line numberDiff line change
@@ -84,79 +84,79 @@ groups:
8484
reviewers:
8585
teams: [reviewers-amazon]
8686
reviews:
87-
request: 10
87+
request: 0 # Do not auto-add
8888
shared-reviewers-apple:
8989
type: optional
9090
conditions:
9191
- files.include('*')
9292
reviewers:
9393
teams: [reviewers-apple]
9494
reviews:
95-
request: 10
95+
request: 0 # Do not auto-add
9696
shared-reviewers-bosch:
9797
type: optional
9898
conditions:
9999
- files.include('*')
100100
reviewers:
101101
teams: [reviewers-bosch]
102102
reviews:
103-
request: 10
103+
request: 0 # Do not auto-add
104104
shared-reviewers-comcast:
105105
type: optional
106106
conditions:
107107
- files.include('*')
108108
reviewers:
109109
teams: [reviewers-comcast]
110110
reviews:
111-
request: 10
111+
request: 0 # Do not auto-add
112112
shared-reviewers-dyson:
113113
type: optional
114114
conditions:
115115
- files.include('*')
116116
reviewers:
117117
teams: [reviewers-dyson]
118118
reviews:
119-
request: 10
119+
request: 0 # Do not auto-add
120120
shared-reviewers-espressif:
121121
type: optional
122122
conditions:
123123
- files.include('*')
124124
reviewers:
125125
teams: [reviewers-espressif]
126126
reviews:
127-
request: 10
127+
request: 0 # Do not auto-add
128128
shared-reviewers-google:
129129
type: optional
130130
conditions:
131131
- files.include('*')
132132
reviewers:
133133
teams: [reviewers-google]
134134
reviews:
135-
request: 10
135+
request: 0 # Do not auto-add
136136
shared-reviewers-grundfos:
137137
type: optional
138138
conditions:
139139
- files.include('*')
140140
reviewers:
141141
teams: [reviewers-grundfos]
142142
reviews:
143-
request: 10
143+
request: 0 # Do not auto-add
144144
shared-reviewers-irobot:
145145
type: optional
146146
conditions:
147147
- files.include('*')
148148
reviewers:
149149
teams: [reviewers-irobot]
150150
reviews:
151-
request: 10
151+
request: 0 # Do not auto-add
152152
shared-reviewers-lg:
153153
type: optional
154154
conditions:
155155
- files.include('*')
156156
reviewers:
157157
teams: [reviewers-lg]
158158
reviews:
159-
request: 10
159+
request: 0 # Do not auto-add
160160
shared-reviewers-logitech:
161161
type: optional
162162
conditions:
@@ -172,31 +172,31 @@ groups:
172172
reviewers:
173173
teams: [reviewers-nordic]
174174
reviews:
175-
request: 10
175+
request: 0 # Do not auto-add
176176
shared-reviewers-nxp:
177177
type: optional
178178
conditions:
179179
- files.include('*')
180180
reviewers:
181181
teams: [reviewers-nxp]
182182
reviews:
183-
request: 10
183+
request: 0 # Do not auto-add
184184
shared-reviewers-samsung:
185185
type: optional
186186
conditions:
187187
- files.include('*')
188188
reviewers:
189189
teams: [reviewers-samsung]
190190
reviews:
191-
request: 10
191+
request: 0 # Do not auto-add
192192
shared-reviewers-eve:
193193
type: optional
194194
conditions:
195195
- files.include('*')
196196
reviewers:
197197
teams: [reviewers-eve]
198198
reviews:
199-
request: 10
199+
request: 0 # Do not auto-add
200200
# shared-reviewers-signify disabled for now, because the reviewers-signify
201201
# team is empty and pullapprove seems to mis-handle that badly and treats
202202
# _all_ reviewers as being in this group.
@@ -210,39 +210,39 @@ groups:
210210
# reviewers:
211211
# teams: [reviewers-signify]
212212
# reviews:
213-
# request: 10
213+
# request: 0 # Do not auto-add
214214
shared-reviewers-silabs:
215215
type: optional
216216
conditions:
217217
- files.include('*')
218218
reviewers:
219219
teams: [reviewers-silabs]
220220
reviews:
221-
request: 10
221+
request: 0 # Do not auto-add
222222
shared-reviewers-somfy:
223223
type: optional
224224
conditions:
225225
- files.include('*')
226226
reviewers:
227227
teams: [reviewers-somfy]
228228
reviews:
229-
request: 10
229+
request: 0 # Do not auto-add
230230
shared-reviewers-tcl:
231231
type: optional
232232
conditions:
233233
- files.include('*')
234234
reviewers:
235235
teams: [reviewers-tcl]
236236
reviews:
237-
request: 10
237+
request: 0 # Do not auto-add
238238
shared-reviewers-qorvo:
239239
type: optional
240240
conditions:
241241
- files.include('*')
242242
reviewers:
243243
teams: [reviewers-qorvo]
244244
reviews:
245-
request: 10
245+
request: 0 # Do not auto-add
246246

247247
############################################################
248248
# Base Required Reviewers

CODEOWNERS

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
/src/platform/ASR/ @tx2rx
2+
asr/ @tx2rx
3+
chip-build-asr/ @tx2rx
4+
5+
/src/platform/Ameba/ @pankore
6+
ameba/ @pankore
7+
chip-build-ameba/ @pankore
8+
9+
/src/platform/Beken/ @zhengyaohan
10+
11+
*.mm @project-chip/reviewers-apple
12+
darwin/ @project-chip/reviewers-apple
13+
/src/darwin/ @project-chip/reviewers-apple
14+
/src/platform/Darwin/ @project-chip/reviewers-apple
15+
/examples/darwin-framework-tool/ @project-chip/reviewers-apple
16+
17+
/src/platform/ESP32/ @project-chip/reviewers-espressif
18+
esp32/ @project-chip/reviewers-espressif
19+
chip-build-esp32/ @project-chip/reviewers-espressif
20+
chip-build-esp32-qemu/ @project-chip/reviewers-espressif
21+
22+
/src/platform/Infineon/ @ifyall
23+
infineon/ @ifyall
24+
chip-build-infineon/ @ifyall
25+
26+
/src/platform/NuttX/ @zhhyu7
27+
chip-build-nuttx/ @zhhyu7
28+
29+
/src/platform/Tizen/ @arkq
30+
tizen/ @arkq
31+
chip-build-tizen/ @arkq
32+
chip-build-tizen-qemu/ @arkq
33+
34+
*.java @project-chip/reviewers-google
35+
*.kt @project-chip/reviewers-google
36+
android/ @project-chip/reviewers-google
37+
/src/examples/chef/ @project-chip/reviewers-google
38+
/integrations/appengine/ @project-chip/reviewers-google
39+
/integrations/cloudbuild/ @project-chip/reviewers-google
40+
/integrations/compute_engine/ @project-chip/reviewers-google
41+
chip-build-java/ @project-chip/reviewers-google
42+
chip-build-android/ @project-chip/reviewers-google
43+
44+
/src/platform/bouffalolab/ @wy-hh
45+
chip-build-bouffalolab/ @wy-hh
46+
47+
cc13xx_26xx/ @s-jain2022
48+
cc32xx/ @s-jain2022
49+
50+
/src/platform/mt793x/ @pakls
51+
nrfconnect/ @project-chip/reviewers-nordic
52+
chip-build-nrf-platform/ @project-chip/reviewers-nordic
53+
Zephyr/ @project-chip/reviewers-nordic @project-chip/reviewers-nxp @s07641069
54+
55+
56+
nxp/ @project-chip/reviewers-nxp
57+
chip-build-nxp/ @project-chip/reviewers-nxp
58+
chip-build-nxp-zephyr/ @project-chip/reviewers-nxp
59+
chip-build-k32w/ @project-chip/reviewers-nxp
60+
61+
qpg/ @dvdm-qorvo
62+
63+
silabs/ @project-chip/reviewers-silabs
64+
chip-build-efr32/ @project-chip/reviewers-silabs
65+
66+
stm32/ @STYoannZamaron
67+
68+
telink/ @s07641069
69+
chip-build-telink/ @s07641069
70+
71+
webos/ @joonhaengHeo

build/config/compiler/BUILD.gn

+35-25
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,40 @@ if (current_os == "mac" || current_os == "ios") {
2424
import("${build_root}/config/mac/mac_sdk.gni")
2525
}
2626

27+
# To use different sanitizer options, use `gn args .` in the out folder and
28+
# use settings like:
29+
#
30+
# is_clang=true
31+
# is_debug=true
32+
# optimize_for_size=false
33+
# is_asan=true
34+
# is_sanitize_fatal=false
35+
#
36+
2737
declare_args() {
2838
# Enable -Werror. This can be disabled if using a different compiler
2939
# with unfixed or unsupported wanings.
3040
treat_warnings_as_errors = true
41+
42+
# Enable Thread sanitizer
43+
is_tsan = false
44+
45+
# Enable memory sanitizer
46+
is_msan = false
47+
48+
# enable undefined behavior sanitizer
49+
is_ubsan = false
50+
51+
# Exit on sanitize error. Generally standard libraries may get errors
52+
# so not stopping on the first error is often useful
53+
is_sanitize_fatal = true
54+
55+
# Enable or disable Runtime Type Information (RTTI).
56+
# Defaults true on darwin because Darwin.framework uses it.
57+
enable_rtti = current_os == "mac" || current_os == "ios"
58+
59+
# Enable or disable support for C++ exceptions.
60+
enable_exceptions = false
3161
}
3262

3363
if (current_cpu == "arm" || current_cpu == "arm64") {
@@ -397,21 +427,6 @@ config("runtime_default") {
397427
# is_sanitize_fatal=false
398428
#
399429

400-
declare_args() {
401-
# Enable Thread sanitizer
402-
is_tsan = false
403-
404-
# Enable memory sanitizer
405-
is_msan = false
406-
407-
# enable undefined behavior sanitizer
408-
is_ubsan = false
409-
410-
# Exit on sanitize error. Generally standard libraries may get errors
411-
# so not stopping on the first error is often useful
412-
is_sanitize_fatal = true
413-
}
414-
415430
config("sanitize_address") {
416431
defines = []
417432
cflags = [
@@ -452,10 +467,14 @@ config("sanitize_undefined_behavior") {
452467
"-fsanitize=unsigned-integer-overflow",
453468
"-fsanitize=implicit-conversion",
454469
"-fsanitize=nullability",
455-
"-fno-sanitize=vptr,function",
456470
]
457471
}
458472

473+
#According to the LLVM UBSan documentation, sanitizing vptr is incompatible with the -fno-rtti flag.
474+
if (!enable_rtti) {
475+
cflags += [ "-fno-sanitize=vptr" ]
476+
}
477+
459478
ldflags = cflags
460479
}
461480

@@ -522,15 +541,6 @@ config("coverage_default") {
522541
}
523542
}
524543

525-
declare_args() {
526-
# Enable or disable Runtime Type Information (RTTI).
527-
# Defaults true on darwin because Darwin.framework uses it.
528-
enable_rtti = current_os == "mac" || current_os == "ios"
529-
530-
# Enable or disable support for C++ exceptions.
531-
enable_exceptions = false
532-
}
533-
534544
config("no_rtti") {
535545
cflags_cc = [ "-fno-rtti" ]
536546
}

data_model/in_progress/clusters/BasicInformationCluster.xml data_model/1.4/clusters/BasicInformationCluster.xml

+1-6
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Davis, CA 95616, USA
6060
<revision revision="1" summary="Initial revision"/>
6161
<revision revision="2" summary="Added ProductAppearance attribute"/>
6262
<revision revision="3" summary="Added SpecificationVersion and MaxPathsPerInvoke attributes"/>
63-
<revision revision="4" summary="Updated conformance for UniqueID to mandatory. Added DeviceLocation attribute."/>
63+
<revision revision="4" summary="Updated conformance for UniqueID to mandatory."/>
6464
</revisionHistory>
6565
<clusterIds>
6666
<clusterId id="0x0028" name="Basic Information"/>
@@ -303,11 +303,6 @@ Davis, CA 95616, USA
303303
<mandatoryConform/>
304304
<constraint type="min" value="1"/>
305305
</attribute>
306-
<attribute id="0x0017" name="DeviceLocation" type="locationdesc" default="MS">
307-
<access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
308-
<quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
309-
<optionalConform/>
310-
</attribute>
311306
</attributes>
312307
<events>
313308
<event id="0x00" name="StartUp" priority="critical">

data_model/in_progress/clusters/CommissionerControlCluster.xml data_model/1.4/clusters/CommissionerControlCluster.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Davis, CA 95616, USA
116116
</field>
117117
<field id="2" name="Discriminator" type="uint16">
118118
<mandatoryConform/>
119-
<constraint type="between" from="0" to="4095"/>
119+
<constraint type="max" value="4095"/>
120120
</field>
121121
<field id="3" name="Iterations" type="uint32">
122122
<mandatoryConform/>

0 commit comments

Comments
 (0)