summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjkarlin <jkarlin@chromium.org>2015-11-03 10:12:46 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-03 18:14:27 +0000
commit5fdf5b07fab4596ffc45db28a4d71df3a7cb702a (patch)
tree5106cc180ef8e8d1f9d2341c887b2bc57c2281a8
parentbc031797319050c7641cc1da52921aa96fb7772b (diff)
downloadchromium_src-5fdf5b07fab4596ffc45db28a4d71df3a7cb702a.zip
chromium_src-5fdf5b07fab4596ffc45db28a4d71df3a7cb702a.tar.gz
chromium_src-5fdf5b07fab4596ffc45db28a4d71df3a7cb702a.tar.bz2
[CR] Support architecture types with gn
Set an architecture arg when gn is the generator. Review URL: https://codereview.chromium.org/1381723002 Cr-Commit-Position: refs/heads/master@{#357546}
-rw-r--r--tools/cr/cr/actions/gn.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/cr/cr/actions/gn.py b/tools/cr/cr/actions/gn.py
index 5c683bd..34b045b 100644
--- a/tools/cr/cr/actions/gn.py
+++ b/tools/cr/cr/actions/gn.py
@@ -32,6 +32,10 @@ class GnPrepareOut(cr.PrepareOut):
gn_args += (' is_debug=%s' %
('true' if cr.context['CR_BUILDTYPE'] == 'Debug' else 'false'))
+ arch = cr.context.Find('CR_ENVSETUP_ARCH') or ''
+ if arch:
+ gn_args += ' target_cpu="%s"' % ('x86' if arch == 'ia32' else arch)
+
# Detect goma.
goma_binaries = cr.Host.SearchPath('gomacc', [
'{GOMA_DIR}',