From 9f07665c920ceeb72edcb53922a946f1b55fb3ec Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Tue, 16 Apr 2013 20:59:41 +0000 Subject: [PATCH] Clean up isolate.gypi and use the new -V FOO=<(FOO) format. This will be useful later once we start providing more variables, so that GYP do not interfere with the command line. R=csharp@chromium.org BUG= Review URL: https://codereview.chromium.org/14298005 git-svn-id: http://src.chromium.org/svn/trunk/src/build@194444 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- isolate.gypi | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/isolate.gypi b/isolate.gypi index 83ef854df..7b81697d8 100644 --- a/isolate.gypi +++ b/isolate.gypi @@ -71,12 +71,16 @@ '<(test_isolation_mode)', # GYP will eliminate duplicate arguments so '<(PRODUCT_DIR)' cannot # be provided twice. To work around this behavior, append '/'. + # # Also have a space after <(PRODUCT_DIR) or visual studio will # escape the argument wrappping " with the \ and merge it into # the following arguments. + # + # Other variables should use the -V FOO=<(FOO) form so frequent + # values, like '0' or '1', aren't stripped out by GYP. '--outdir', '<(PRODUCT_DIR)/ ', '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ', - '--variable', 'OS', '<(OS)', + '--variable', 'OS=<(OS)', '--result', '<@(_outputs)', '--isolate', '<(RULE_INPUT_PATH)', ], @@ -86,11 +90,9 @@ '<(DEPTH)/tools/swarm_client/isolate.py', '<(test_isolation_mode)', '--outdir', '<(test_isolation_outdir)', - # Have a space after <(PRODUCT_DIR) or visual studio will - # escape the argument wrappping " with the \ and merge it into - # the following arguments. + # See comment above. '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ', - '--variable', 'OS', '<(OS)', + '--variable', 'OS=<(OS)', '--result', '<@(_outputs)', '--isolate', '<(RULE_INPUT_PATH)', ],