Stop sharing code between ios_framework_bundle & mac_framework_bundle.

Stop sharing code between ios_framework_bundle & mac_framework_bundle.

The ios_framework_bundle and mac_framework_bundle templates were
sharing part of the implementation via the framework_bundle. This
template is unnecessarily complex due to differences between iOS
and macOS build so remove it and inline the implementation in the
two OS specific templates.

BUG=None

Committed: https://crrev.com/9d5d9721db94c90e362f857be02b5f0de22a5219
Cr-Commit-Position: refs/heads/master@{#409966}

[sdefresne, 2016-08-03 22:54:10]

The CQ bit was checked by sdefresne@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-08-03 22:54:48]

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

[sdefresne, 2016-08-03 22:54:59]

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

[sdefresne, 2016-08-03 22:54:59]

Please take a look.

[commit-bot: I haz the power, 2016-08-03 22:59:33]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-03 22:59:33]

Dry run: Try jobs failed on following builders:
  android_clang_dbg_recipe on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/android_clan...)
  cast_shell_android on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/cast_shell_a...)
  linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)
  chromium_presubmit on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)
  mac_chromium_compile_dbg_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)
  mac_chromium_rel_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[sdefresne, 2016-08-03 23:00:45]

Sorry about the large CL, but this is a bit hard to split. I can try if you
prefer.

[sdefresne, 2016-08-03 23:03:24]

The CQ bit was checked by sdefresne@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-08-03 23:04:04]

Dry run: 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-08-03 23:15:31]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-03 23:15:32]

Dry run: Try jobs failed on following builders:
  ios-device on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device/builds...)
  ios-simulator on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator/bui...)

[Robert Sesek, 2016-08-04 15:01:56]

I assumed you copy/pasted chunks, so I just made sure that the right chunks from
base_rules.gni went to the right files, rather than checking line-by-line. There
are failures on ios- bots through.

[sdefresne, 2016-08-04 20:54:19]

The CQ bit was checked by sdefresne@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-08-04 20:54:45]

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

[sdefresne, 2016-08-04 20:55:10]

On 2016/08/04 15:01:56, Robert Sesek wrote:
> I assumed you copy/pasted chunks, so I just made sure that the right chunks
from
> base_rules.gni went to the right files, rather than checking line-by-line.
There
> are failures on ios- bots through.

Yes, this is what I did (copy-n-paste). It did not work on iOS because
ios_framework_bundle and framework_bundle used the same name for one variable.
Fixed.

Can you take another look?

[Robert Sesek, 2016-08-04 21:41:43]

LGTM

[commit-bot: I haz the power, 2016-08-04 22:20:47]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-04 22:20:47]

Dry run: This issue passed the CQ dry run.

[sdefresne, 2016-08-05 01:56:17]

The CQ bit was checked by sdefresne@chromium.org

[commit-bot: I haz the power, 2016-08-05 01:56:40]

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-08-05 02:00:31]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2016-08-05 02:01:58]

Description was changed from

==========
Stop sharing code between ios_framework_bundle & mac_framework_bundle.

The ios_framework_bundle and mac_framework_bundle templates were
sharing part of the implementation via the framework_bundle. This
template is unnecessarily complex due to differences between iOS
and macOS build so remove it and inline the implementation in the
two OS specific templates.

BUG=None
==========

to

==========
Stop sharing code between ios_framework_bundle & mac_framework_bundle.

The ios_framework_bundle and mac_framework_bundle templates were
sharing part of the implementation via the framework_bundle. This
template is unnecessarily complex due to differences between iOS
and macOS build so remove it and inline the implementation in the
two OS specific templates.

BUG=None

Committed: https://crrev.com/9d5d9721db94c90e362f857be02b5f0de22a5219
Cr-Commit-Position: refs/heads/master@{#409966}
==========

[commit-bot: I haz the power, 2016-08-05 02:01:59]

Patchset 3 (id:??) landed as
https://crrev.com/9d5d9721db94c90e362f857be02b5f0de22a5219
Cr-Commit-Position: refs/heads/master@{#409966}