Index: scripts/slave/recipe_modules/v8/chromium_config.py |
diff --git a/scripts/slave/recipe_modules/v8/chromium_config.py b/scripts/slave/recipe_modules/v8/chromium_config.py |
index f7d48e097d956be7ee3e856ae3bc59d4abe5e8da..e5cb4d64e191454bbfa33b8f178b0c3db61316c2 100644 |
--- a/scripts/slave/recipe_modules/v8/chromium_config.py |
+++ b/scripts/slave/recipe_modules/v8/chromium_config.py |
@@ -1,18 +1,18 @@ |
+# Copyright 2013 The Chromium Authors. All rights reserved. |
+# Use of this source code is governed by a BSD-style license that can be |
+# found in the LICENSE file. |
+ |
from slave.recipe_config_types import Path |
+from slave import recipe_config |
from RECIPE_MODULES.chromium import CONFIG_CTX |
@CONFIG_CTX() |
def v8(c): |
- if c.TARGET_ARCH == 'arm': |
- v8_target_arch = 'arm' |
- elif c.TARGET_ARCH == 'mips': |
- v8_target_arch = 'mips' |
- elif c.TARGET_BITS == 64: |
- v8_target_arch = 'x64' |
- else: |
- v8_target_arch = 'ia32' |
- c.gyp_env.GYP_DEFINES['v8_target_arch'] = v8_target_arch |
+ targ_arch = c.gyp_env.GYP_DEFINES.get('target_arch') |
+ if not targ_arch: # pragma: no cover |
+ raise recipe_config.BadConf('v8 must have a valid target_arch.') |
+ c.gyp_env.GYP_DEFINES['v8_target_arch'] = targ_arch |
del c.gyp_env.GYP_DEFINES['component'] |
c.build_config_fs = c.BUILD_CONFIG |
c.build_dir = Path('[CHECKOUT]') |