aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@google.com>2015-04-02 17:35:25 -0400
committerGravatar Mike Klein <mtklein@google.com>2015-04-02 17:35:25 -0400
commita41699271fa9291d6c165087c9be168deda966e5 (patch)
treee9e77db887ff5023d8d11125090efc4b6222d037 /platform_tools
parent0f05443bf1f8f851955a6ae4da6f6f6e6040deeb (diff)
back to plain arm for the night
It's looking like the previous CL did not fix the Daisy bot GMs, even though that's still the only bit of code I can find that was ignoring color order. Puzzled. Reverting arm_version=7 for now. BUG=skia:1843 Review URL: https://codereview.chromium.org/1051423002
Diffstat (limited to 'platform_tools')
-rwxr-xr-xplatform_tools/chromeos/bin/chromeos_setup.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/platform_tools/chromeos/bin/chromeos_setup.sh b/platform_tools/chromeos/bin/chromeos_setup.sh
index 721d7d6c53..de4d6f99ca 100755
--- a/platform_tools/chromeos/bin/chromeos_setup.sh
+++ b/platform_tools/chromeos/bin/chromeos_setup.sh
@@ -34,8 +34,8 @@ setup_device() {
GENERIC_BOARD_TYPE="amd64-generic"
;;
daisy)
- # TODO(mtklein): make this arm_neon=1
- DEFINES="${DEFINES} skia_arch_type=arm arm_version=7 arm_neon=0"
+ # 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"