Correct iOS GN hermetic support.

Correct iOS GN hermetic support.

BUG=

Committed: https://crrev.com/e3f7eea5174f118c4baf5562b157cdee651a9426
Cr-Commit-Position: refs/heads/master@{#428373}

[justincohen, 2016-10-26 00:36:40]

Description was changed from

==========
Add iOS GN hermetic support.

BUG=
==========

to

==========
Correct iOS GN hermetic support.

BUG=
==========

[justincohen, 2016-10-26 00:36:47]

justincohen@chromium.org changed reviewers:
+ sdefresne@chromium.org

[justincohen, 2016-10-26 00:36:48]

ptal

https://codereview.chromium.org/2452593004/diff/1/build/toolchain/mac/linker_...
File build/toolchain/mac/linker_driver.py (right):

https://codereview.chromium.org/2452593004/diff/1/build/toolchain/mac/linker_...
build/toolchain/mac/linker_driver.py:57: del args[2]
I didn't want to change linker_driver to something like argparse.  What do you
think here?

https://codereview.chromium.org/2452593004/diff/1/ios/build/tools/setup-gn.py
File ios/build/tools/setup-gn.py (right):

https://codereview.chromium.org/2452593004/diff/1/ios/build/tools/setup-gn.py...
ios/build/tools/setup-gn.py:100: args.append(('use_system_xcode', False))
I know we want to get rid of env var, but for now we still have this.  wdyt?

[sdefresne, 2016-10-26 15:33:07]

https://codereview.chromium.org/2452593004/diff/1/build/config/ios/find_signi...
File build/config/ios/find_signing_identity.py (right):

https://codereview.chromium.org/2452593004/diff/1/build/config/ios/find_signi...
build/config/ios/find_signing_identity.py:13: '/usr/bin/env',
I think you can remove the '/usr/bin/env' here.

https://codereview.chromium.org/2452593004/diff/1/build/config/ios/rules.gni
File build/config/ios/rules.gni (right):

https://codereview.chromium.org/2452593004/diff/1/build/config/ios/rules.gni#...
build/config/ios/rules.gni:8: 
import("//build/toolchain/toolchain.gni")

https://codereview.chromium.org/2452593004/diff/1/build/toolchain/mac/linker_...
File build/toolchain/mac/linker_driver.py (right):

https://codereview.chromium.org/2452593004/diff/1/build/toolchain/mac/linker_...
build/toolchain/mac/linker_driver.py:57: del args[2]
On 2016/10/26 00:36:48, justincohen wrote:
> I didn't want to change linker_driver to something like argparse.  What do you
> think here?

Can you instead iterate over the arguments then?

for i in xrange(len(args)):
  if args[i] != '--developer_dir':
    continue
  os.environ['DEVELOPER_DIR'] = args[i + 1]
  del args[i:i+2]
  break

https://codereview.chromium.org/2452593004/diff/1/ios/build/tools/setup-gn.py
File ios/build/tools/setup-gn.py (right):

https://codereview.chromium.org/2452593004/diff/1/ios/build/tools/setup-gn.py...
ios/build/tools/setup-gn.py:100: args.append(('use_system_xcode', False))
On 2016/10/26 00:36:48, justincohen wrote:
> I know we want to get rid of env var, but for now we still have this.  wdyt?

The bots don't use the output of this script and developer can configure
variables via ~/.setup-gn, so I think we don't need this change. You can just
have the following to control the same thing without using environment
variables:

$ cat ~/.setup-gn
[gn_args]
use_system_xcode = false

WDYT?

[justincohen, 2016-10-27 13:36:38]

justincohen@chromium.org changed reviewers:
+ dpranke@google.com

[justincohen, 2016-10-27 13:36:39]

Thanks for the review.  PTAL!

https://codereview.chromium.org/2452593004/diff/1/build/config/ios/find_signi...
File build/config/ios/find_signing_identity.py (right):

https://codereview.chromium.org/2452593004/diff/1/build/config/ios/find_signi...
build/config/ios/find_signing_identity.py:13: '/usr/bin/env',
On 2016/10/26 15:33:07, sdefresne wrote:
> I think you can remove the '/usr/bin/env' here.

Done.

https://codereview.chromium.org/2452593004/diff/1/build/config/ios/rules.gni
File build/config/ios/rules.gni (right):

https://codereview.chromium.org/2452593004/diff/1/build/config/ios/rules.gni#...
build/config/ios/rules.gni:8: 
On 2016/10/26 15:33:07, sdefresne wrote:
> import("//build/toolchain/toolchain.gni")

Done.

https://codereview.chromium.org/2452593004/diff/1/build/toolchain/mac/linker_...
File build/toolchain/mac/linker_driver.py (right):

https://codereview.chromium.org/2452593004/diff/1/build/toolchain/mac/linker_...
build/toolchain/mac/linker_driver.py:57: del args[2]
On 2016/10/26 15:33:07, sdefresne wrote:
> On 2016/10/26 00:36:48, justincohen wrote:
> > I didn't want to change linker_driver to something like argparse.  What do
you
> > think here?
> 
> Can you instead iterate over the arguments then?
> 
> for i in xrange(len(args)):
>   if args[i] != '--developer_dir':
>     continue
>   os.environ['DEVELOPER_DIR'] = args[i + 1]
>   del args[i:i+2]
>   break

Done.

https://codereview.chromium.org/2452593004/diff/1/ios/build/tools/setup-gn.py
File ios/build/tools/setup-gn.py (right):

https://codereview.chromium.org/2452593004/diff/1/ios/build/tools/setup-gn.py...
ios/build/tools/setup-gn.py:100: args.append(('use_system_xcode', False))
On 2016/10/26 15:33:07, sdefresne wrote:
> On 2016/10/26 00:36:48, justincohen wrote:
> > I know we want to get rid of env var, but for now we still have this.  wdyt?
> 
> The bots don't use the output of this script and developer can configure
> variables via ~/.setup-gn, so I think we don't need this change. You can just
> have the following to control the same thing without using environment
> variables:
> 
> $ cat ~/.setup-gn
> [gn_args]
> use_system_xcode = false
> 
> WDYT?

Per offline discussion with sdefresne@, I will leave this here for now.  When we
remove the environment
variable FORCE_MAC_TOOLCHAIN, this will be removed as well.

[sdefresne, 2016-10-27 14:26:18]

lgtm

[Dirk Pranke, 2016-10-27 23:42:27]

dpranke@chromium.org changed reviewers:
+ dpranke@chromium.org

[Dirk Pranke, 2016-10-27 23:42:28]

lgtm

[justincohen, 2016-10-28 14:01:30]

The CQ bit was checked by justincohen@chromium.org

[commit-bot: I haz the power, 2016-10-28 14:01:48]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-28 15:08:01]

Description was changed from

==========
Correct iOS GN hermetic support.

BUG=
==========

to

==========
Correct iOS GN hermetic support.

BUG=
==========

[commit-bot: I haz the power, 2016-10-28 15:08:02]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2016-10-28 15:11:04]

Description was changed from

==========
Correct iOS GN hermetic support.

BUG=
==========

to

==========
Correct iOS GN hermetic support.

BUG=

Committed: https://crrev.com/e3f7eea5174f118c4baf5562b157cdee651a9426
Cr-Commit-Position: refs/heads/master@{#428373}
==========

[commit-bot: I haz the power, 2016-10-28 15:11:05]

Patchset 2 (id:??) landed as
https://crrev.com/e3f7eea5174f118c4baf5562b157cdee651a9426
Cr-Commit-Position: refs/heads/master@{#428373}