Revert of Try ARMv7 and NEON for Daisy.

platform_tools/chromeos/bin/chromeos_setup.sh

 # Set up the environment to build Skia for ChromeOS.
 ###############################################################################
 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 ###############################################################################
 
 function exportVar {
   NAME=$1
@@ skipping 16 matching lines @@
   fi
 
   DEFINES="OS=linux host_os=linux skia_os=chromeos skia_gpu=0"
 
   case $TARGET_DEVICE in
     link)
         DEFINES="${DEFINES} skia_arch_type=x86_64"
         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"
         GENERIC_BOARD_TYPE="arm-generic"
         ;;
     *)
         echo -n "ERROR: unknown device specified ($TARGET_DEVICE), valid values: "
         echo "x86-alex link daisy"
         return 1;
         ;;
   esac
 
   echo "The build is targeting the device: $TARGET_DEVICE"
 
   exportVar GENERIC_BOARD_TYPE ${GENERIC_BOARD_TYPE}
   exportVar GYP_DEFINES "$DEFINES"
   exportVar GYP_GENERATORS "ninja"
   exportVar GYP_GENERATOR_FLAGS ""
   exportVar SKIA_OUT "out/config/chromeos-${TARGET_DEVICE}"
   exportVar builddir_name "."
 }