| Index: platform_tools/chromeos/bin/chromeos_setup.sh
 | 
| diff --git a/platform_tools/chromeos/bin/chromeos_setup.sh b/platform_tools/chromeos/bin/chromeos_setup.sh
 | 
| index b04eb1b31029e6731d873abdbc9e8d3e944fe701..de4d6f99ca01e8d5846beb6dd1ecef3ea2eab603 100755
 | 
| --- a/platform_tools/chromeos/bin/chromeos_setup.sh
 | 
| +++ b/platform_tools/chromeos/bin/chromeos_setup.sh
 | 
| @@ -34,7 +34,8 @@
 | 
|          GENERIC_BOARD_TYPE="amd64-generic"
 | 
|          ;;
 | 
|      daisy)
 | 
| -        DEFINES="${DEFINES} skia_arch_type=arm arm_version=7 arm_neon=1"
 | 
| +        # TODO(mtklein): make this arm_version=7 arm_neon=1
 | 
| +        DEFINES="${DEFINES} skia_arch_type=arm"
 | 
|          # TODO(borenet): We have to define skia_warnings_as_errors=0 for the arm
 | 
|          # build, which throws lots of "mangling of va_list has changed" warnings.
 | 
|          DEFINES="${DEFINES} skia_warnings_as_errors=0"
 | 
| 
 |