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

Side by Side Diff: scripts/slave/recipe_modules/v8/chromium_config.py

Issue 1150253002: Partial revert of Remove arm_float_abi=hard from GYP_DEFINES (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 5 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | scripts/slave/recipes/v8.expected/full_client_v8_V8_Arm___builder.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 from slave.recipe_config import BadConf 5 from slave.recipe_config import BadConf
6 from slave.recipe_config_types import Path 6 from slave.recipe_config_types import Path
7 from slave import recipe_config 7 from slave import recipe_config
8 8
9 import DEPS 9 import DEPS
10 CONFIG_CTX = DEPS['chromium'].CONFIG_CTX 10 CONFIG_CTX = DEPS['chromium'].CONFIG_CTX
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 if c.TARGET_BITS == 64: 46 if c.TARGET_BITS == 64:
47 c.build_config_fs = 'android_arm64.release' 47 c.build_config_fs = 'android_arm64.release'
48 else: 48 else:
49 c.build_config_fs = 'android_arm.release' 49 c.build_config_fs = 'android_arm.release'
50 50
51 51
52 @CONFIG_CTX(includes=['v8']) 52 @CONFIG_CTX(includes=['v8'])
53 def arm_hard_float(c): 53 def arm_hard_float(c):
54 c.compile_py.pass_arch_flag = True 54 c.compile_py.pass_arch_flag = True
55 c.compile_py.cross_tool = '/usr/bin/arm-linux-gnueabihf' 55 c.compile_py.cross_tool = '/usr/bin/arm-linux-gnueabihf'
56 c.gyp_env.GYP_DEFINES['arm_float_abi'] = 'hard'
56 57
57 58
58 @CONFIG_CTX(includes=['v8']) 59 @CONFIG_CTX(includes=['v8'])
59 def disassembler(c): 60 def disassembler(c):
60 c.gyp_env.GYP_DEFINES['v8_enable_disassembler'] = 1 61 c.gyp_env.GYP_DEFINES['v8_enable_disassembler'] = 1
61 62
62 63
63 @CONFIG_CTX(includes=['v8']) 64 @CONFIG_CTX(includes=['v8'])
64 def embed_script_mjsunit(c): 65 def embed_script_mjsunit(c):
65 c.gyp_env.GYP_DEFINES['embed_script'] = Path( 66 c.gyp_env.GYP_DEFINES['embed_script'] = Path(
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 def vtunejit(c): 180 def vtunejit(c):
180 c.gyp_env.GYP_DEFINES['v8_enable_vtunejit'] = 1 181 c.gyp_env.GYP_DEFINES['v8_enable_vtunejit'] = 1
181 182
182 183
183 @CONFIG_CTX(includes=['v8']) 184 @CONFIG_CTX(includes=['v8'])
184 def x87(c): 185 def x87(c):
185 # TODO(machenbach): Chromium does not support x87 yet. With the current 186 # TODO(machenbach): Chromium does not support x87 yet. With the current
186 # configuration, target_arch can't be set through a parameter as ARCH=intel 187 # configuration, target_arch can't be set through a parameter as ARCH=intel
187 # and BITS=32 is ambigue with x87. 188 # and BITS=32 is ambigue with x87.
188 c.gyp_env.GYP_DEFINES['v8_target_arch'] = 'x87' 189 c.gyp_env.GYP_DEFINES['v8_target_arch'] = 'x87'
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipes/v8.expected/full_client_v8_V8_Arm___builder.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698