File tree 1 file changed +10
-8
lines changed
1 file changed +10
-8
lines changed Original file line number Diff line number Diff line change 28
28
CHIP_ROOT=" $MATTER_ROOT "
29
29
fi
30
30
31
+ if [[ -z " ${PW_ENVIRONMENT_ROOT} " ]]; then
32
+ echo " Using the bootstrapped pigweed ENV in Matter root"
33
+ PW_PATH=" $CHIP_ROOT /.environment/cipd/packages/pigweed"
34
+ else
35
+ echo " Using provided $PW_ENVIRONMENT_ROOT as Pigweed ENV root"
36
+ PW_PATH=" $PW_ENVIRONMENT_ROOT "
37
+ fi
38
+
31
39
set -x
32
40
env
33
41
USE_WIFI=false
34
42
USE_DOCKER=false
35
43
USE_GIT_SHA_FOR_VERSION=true
36
44
USE_SLC=false
37
- GN_PATH=gn
38
- GN_PATH_PROVIDED=false
45
+ GN_PATH=" $PW_PATH /gn"
39
46
USE_BOOTLOADER=false
40
47
DOTFILE=" .gn"
41
48
270
277
else
271
278
GN_PATH=" $2 "
272
279
fi
273
- GN_PATH_PROVIDED=true
274
280
shift
275
281
shift
276
282
;;
@@ -310,11 +316,7 @@ else
310
316
} & > /dev/null
311
317
fi
312
318
313
- if [ " $USE_SLC " == true ]; then
314
- if [ " $GN_PATH_PROVIDED " == false ]; then
315
- GN_PATH=./.environment/cipd/packages/pigweed/gn
316
- fi
317
- elif [ " $USE_SLC " == false ]; then
319
+ if [ " $USE_SLC " == false ]; then
318
320
# Activation needs to be after SLC generation which is done in gn gen.
319
321
# Zap generation requires activation and is done in the build phase
320
322
source " $CHIP_ROOT /scripts/activate.sh"
You can’t perform that action at this time.
0 commit comments