diff options
| author |  mtklein <mtklein@google.com> | 2015-04-02 09:02:12 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-02 09:02:12 -0700 |
| commit | 192945e92ef7ef97a307db636f242d58c98fff4e (patch) | |
| tree | 5be5ff8e698eca5ec8049c101a62395f83e99a91 /platform_tools | |
| parent | 3c2809bc612f4a265770914f860d214c9665dc4a (diff) | |
Revert of tidy up chromeos_setup.sh (patchset #1 id:1 of https://codereview.chromium.org/1051253002/)
Reason for revert:
arm_thumb not defined
Original issue's description:
> tidy up chromeos_setup.sh
>
> - remove unused alex
> - streamline Link's config
> - remove misleading Daisy config:
> 1) armv7=1 does nothing. We meant to type arm_version=7 here.
> 2) arm_neon=1 does nothing unless arm_version == 7.
> 3) arm_thumb=0 is the default when arm_version <= 7.
> 4) skia_arch_width=32 is the default when skia_arch_type=arm.
>
> I'd just fix this to make Daisy arm_version=7 and arm_neon=1 (and
> arm_thumb=1, which I'm going to separately make the default for
> arm_version=7), but there are known color-order bugs with our
> NEON procs that would make Daisy start pushing bad images to
> Gold. Going to take baby steps here...
>
> BUG=skia:1843
>
> Committed: https://skia.googlesource.com/skia/+/3c2809bc612f4a265770914f860d214c9665dc4a
TBR=borenet@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:1843
Review URL: https://codereview.chromium.org/1059443002
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/chromeos/bin/chromeos_setup.sh | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/platform_tools/chromeos/bin/chromeos_setup.sh b/platform_tools/chromeos/bin/chromeos_setup.sh index 0039a1a443..e2dc32b34e 100755 --- a/platform_tools/chromeos/bin/chromeos_setup.sh +++ b/platform_tools/chromeos/bin/chromeos_setup.sh @@ -1,10 +1,4 @@ # 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 @@ -29,13 +23,16 @@ setup_device() { 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" |