| Index: build/android/buildbot/buildbot_functions.sh
|
| diff --git a/build/android/buildbot/buildbot_functions.sh b/build/android/buildbot/buildbot_functions.sh
|
| index e9dd725de798038179c1129cb78926161727f1ea..b674af3f50e2c54cd6c39b500e49fd33bf720c12 100755
|
| --- a/build/android/buildbot/buildbot_functions.sh
|
| +++ b/build/android/buildbot/buildbot_functions.sh
|
| @@ -49,10 +49,9 @@ function bb_baseline_setup {
|
|
|
| export GYP_GENERATORS=ninja
|
| export GOMA_DIR=/b/build/goma
|
| - . build/android/envsetup.sh
|
| + . build/android/envsetup.sh ""
|
|
|
| - local extra_gyp_defines="$(bb_get_json_prop "$FACTORY_PROPERTIES" \
|
| - extra_gyp_defines) $(bb_get_json_prop "$SLAVE_PROPERTIES" \
|
| + local extra_gyp_defines="$(bb_get_json_prop "$SLAVE_PROPERTIES" \
|
| extra_gyp_defines)"
|
| export GYP_DEFINES+=" fastbuild=1 $extra_gyp_defines"
|
| if echo $extra_gyp_defines | grep -qE 'clang|asan'; then
|
|
|