From 8972c57d0850dcbb76b6b5d20dbc909792b75955 Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Fri, 17 Jan 2014 20:20:27 +0000 Subject: [PATCH] Hook up gomadir in the GN build. Without this, GYP will fail if you manually specify gomadir in your GYP_DEFINES. R=jamesr@chromium.org, jamesr Review URL: https://codereview.chromium.org/137443024 git-svn-id: http://src.chromium.org/svn/trunk/src/build@245595 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- gyp_chromium | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gyp_chromium b/gyp_chromium index c67a98581..f8fa93664 100755 --- a/gyp_chromium +++ b/gyp_chromium @@ -203,6 +203,10 @@ def GetArgsStringForGN(supplemental_files): if v in vars_dict: gn_args += ' ' + v + '=' + EscapeStringForGN(vars_dict[v]) + # gomadir is renamed goma_dir in the GN build. + if 'gomadir' in vars_dict: + gn_args += ' goma_dir="%s"' % vars_dict['gomadir'] + # These arguments get passed directly as integers (avoiding the quoting and # escaping of the string ones above). for v in ['arm_version']: