[webkit-reviews] review granted: [Bug 80861] [Chromium] Remove Android build-fix when the proper fix rolled into WebKit : [Attachment 131632] Patch

[bugzilla-daemon at webkit.org]

Tony Chang <tony at chromium.org> has granted Peter Beverloo
<peter at chromium.org>'s request for review:
Bug 80861: [Chromium] Remove Android build-fix when the proper fix rolled into
WebKit
https://bugs.webkit.org/show_bug.cgi?id=80861

Attachment 131632: Patch
https://bugs.webkit.org/attachment.cgi?id=131632&action=review

------- Additional Comments from Tony Chang <tony at chromium.org>
View in context: https://bugs.webkit.org/attachment.cgi?id=131632&action=review


> Source/WebKit/chromium/gyp_webkit:103
>	 exit(subprocess.call(['bash', '-c', 'source %s && python gyp_webkit
--no-envsetup-recursion %s' % (envsetup_location, ' '.join(args))]))

This is gross.	I bet there's a design that doesn't involve reinvoking
gyp_webkit, but that's beyond the scope of this patch.

> Source/WebKit/chromium/gyp_webkit:107
> +	 os.environ['CROSS_CC'] = find_in_android_toolchain('gcc')
> +	 os.environ['CROSS_CXX'] = find_in_android_toolchain('g++')
> +	 os.environ['CROSS_LINK'] = find_in_android_toolchain('gcc')

Nit: Can we just reuse the results of CROSS_CC to set CROSS_LINK?  Same with
HOST_CC and HOST_LINK below.

> Source/WebKit/chromium/gyp_webkit:111
> +	 os.environ['HOST_CC'] = first_line_of_stdout(['which', 'gcc'])
> +	 os.environ['HOST_CXX'] = first_line_of_stdout(['which', 'g++'])
> +	 os.environ['HOST_LINK'] = first_line_of_stdout(['which', 'g++'])
> +	 os.environ['LIBGCC_FILE_NAME'] =
first_line_of_stdout([os.environ.get('CROSS_CC'), '-print-libgcc-file-name'])

Nit: Can you use a tuple instead of a list?  Alternately, you could just pass
them in as 2 separate args and use *command in the function definition.