Revert of tidy up chromeos_setup.sh

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
   VALUE=$2
   echo export $NAME=\"$VALUE\"
   export $NAME="$VALUE"
 }
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # Helper function to configure the GYP defines to the appropriate values
 # based on the target device.
 setup_device() {
   # Setup the build variation depending on the target device
   TARGET_DEVICE="${SDK_BOARD}"
 
   if [ -z "$TARGET_DEVICE" ]; then
     echo "ERROR: No target device specified!"
     return 1
   fi
 
   DEFINES="OS=linux host_os=linux skia_os=chromeos skia_gpu=0"
 
   case $TARGET_DEVICE in
+    x86-alex)
+        DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32"
+        GENERIC_BOARD_TYPE="x86-generic"
+        ;;
     link)
-        DEFINES="${DEFINES} skia_arch_type=x86_64"
+        DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=64"
         GENERIC_BOARD_TYPE="amd64-generic"
         ;;
     daisy)
-        # TODO(mtklein): make this arm_version=7 and arm_neon=1
-        DEFINES="${DEFINES} skia_arch_type=arm"
+        DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=0 skia_arch_width=32"
         # 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 "."
 }