Commit 072896f3 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

[ios] Fix handling of empty string in ~/setup-gn

If a variable was initialised to an empty string, it would be
generated as `variable = ` instead of `variable = ""` when the
args.gn file was generated, breaking `gn gen`.

Convert the string to the correct format.

Bug: none
Change-Id: I6268623c3e6cd2c27bfdfc167a4a77779e01962f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2282566
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarOlivier Robin <olivierrobin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786267}
parent ced65277
...@@ -168,6 +168,10 @@ class GnGenerator(object): ...@@ -168,6 +168,10 @@ class GnGenerator(object):
stream.write('%s%s%s' % (prefix, item, suffix)) stream.write('%s%s%s' % (prefix, item, suffix))
stream.write(']\n') stream.write(']\n')
else: else:
# ConfigParser removes quote around empty string which confuse
# `gn gen` so restore them.
if not value:
value = '""'
stream.write('%s = %s\n' % (name, value)) stream.write('%s = %s\n' % (name, value))
def WriteBuildNinja(self, gn_command, build_dir): def WriteBuildNinja(self, gn_command, build_dir):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment