diff options
Diffstat (limited to 'platform_tools/chromeos/bin/chromeos_setup.sh')
| -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" |