Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Side by Side Diff: platform_tools/chromeos/bin/chromeos_setup.sh

Issue 1058173002: Revert of Try ARMv7 and NEON for Daisy. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Set up the environment to build Skia for ChromeOS. 1 # Set up the environment to build Skia for ChromeOS.
2 ############################################################################### 2 ###############################################################################
3 # Copyright 2015 Google Inc. 3 # Copyright 2015 Google Inc.
4 # 4 #
5 # Use of this source code is governed by a BSD-style license that can be 5 # Use of this source code is governed by a BSD-style license that can be
6 # found in the LICENSE file. 6 # found in the LICENSE file.
7 ############################################################################### 7 ###############################################################################
8 8
9 function exportVar { 9 function exportVar {
10 NAME=$1 10 NAME=$1
(...skipping 16 matching lines...) Expand all
27 fi 27 fi
28 28
29 DEFINES="OS=linux host_os=linux skia_os=chromeos skia_gpu=0" 29 DEFINES="OS=linux host_os=linux skia_os=chromeos skia_gpu=0"
30 30
31 case $TARGET_DEVICE in 31 case $TARGET_DEVICE in
32 link) 32 link)
33 DEFINES="${DEFINES} skia_arch_type=x86_64" 33 DEFINES="${DEFINES} skia_arch_type=x86_64"
34 GENERIC_BOARD_TYPE="amd64-generic" 34 GENERIC_BOARD_TYPE="amd64-generic"
35 ;; 35 ;;
36 daisy) 36 daisy)
37 DEFINES="${DEFINES} skia_arch_type=arm arm_version=7 arm_neon=1" 37 # TODO(mtklein): make this arm_version=7 arm_neon=1
38 DEFINES="${DEFINES} skia_arch_type=arm"
38 # TODO(borenet): We have to define skia_warnings_as_errors=0 for the arm 39 # TODO(borenet): We have to define skia_warnings_as_errors=0 for the arm
39 # build, which throws lots of "mangling of va_list has changed" warnings . 40 # build, which throws lots of "mangling of va_list has changed" warnings .
40 DEFINES="${DEFINES} skia_warnings_as_errors=0" 41 DEFINES="${DEFINES} skia_warnings_as_errors=0"
41 GENERIC_BOARD_TYPE="arm-generic" 42 GENERIC_BOARD_TYPE="arm-generic"
42 ;; 43 ;;
43 *) 44 *)
44 echo -n "ERROR: unknown device specified ($TARGET_DEVICE), valid values: " 45 echo -n "ERROR: unknown device specified ($TARGET_DEVICE), valid values: "
45 echo "x86-alex link daisy" 46 echo "x86-alex link daisy"
46 return 1; 47 return 1;
47 ;; 48 ;;
48 esac 49 esac
49 50
50 echo "The build is targeting the device: $TARGET_DEVICE" 51 echo "The build is targeting the device: $TARGET_DEVICE"
51 52
52 exportVar GENERIC_BOARD_TYPE ${GENERIC_BOARD_TYPE} 53 exportVar GENERIC_BOARD_TYPE ${GENERIC_BOARD_TYPE}
53 exportVar GYP_DEFINES "$DEFINES" 54 exportVar GYP_DEFINES "$DEFINES"
54 exportVar GYP_GENERATORS "ninja" 55 exportVar GYP_GENERATORS "ninja"
55 exportVar GYP_GENERATOR_FLAGS "" 56 exportVar GYP_GENERATOR_FLAGS ""
56 exportVar SKIA_OUT "out/config/chromeos-${TARGET_DEVICE}" 57 exportVar SKIA_OUT "out/config/chromeos-${TARGET_DEVICE}"
57 exportVar builddir_name "." 58 exportVar builddir_name "."
58 } 59 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698