Add preliminary iOS support to more content/ gypi files

Add preliminary iOS support to more content/ gypi files

Restructures content_app.gypi, content_common.gypi, and content_tests.gypi
slightly to support building them for iOS.

One target, content_browsertests, is excluded entirely for iOS.

More files will be added to the iOS build later, once the content/ build
is working for iOS.

BUG=None


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=155759

[stuartmorgan, 2012-09-07 08:17:46]

The common.gypi changes are because the content gypis have conditional
dependencies based on the webrtc and gpu flags; clearly disabling both is the
right thing for iOS.

[jam, 2012-09-07 16:25:52]

https://codereview.chromium.org/10917130/diff/3001/content/content_common.gypi
File content/content_common.gypi (right):

https://codereview.chromium.org/10917130/diff/3001/content/content_common.gyp...
content/content_common.gypi:532: ['OS=="ios"', {
move this to 374 and combine

https://codereview.chromium.org/10917130/diff/3001/content/content_tests.gypi
File content/content_tests.gypi (right):

https://codereview.chromium.org/10917130/diff/3001/content/content_tests.gypi...
content/content_tests.gypi:141: ['OS != "ios"', {
nit: combine this with the OS == ios section below, i.e

['OS=="ios"', {
}, { # OS!="ios"
}],


probably best to move the other section here, instead of the other way around,
so that all the stuff you moved is easier to find right away

https://codereview.chromium.org/10917130/diff/3001/content/content_tests.gypi...
content/content_tests.gypi:439: ['OS != "ios"', {
ditto

[stuartmorgan, 2012-09-07 17:03:40]

https://codereview.chromium.org/10917130/diff/3001/content/content_common.gypi
File content/content_common.gypi (right):

https://codereview.chromium.org/10917130/diff/3001/content/content_common.gyp...
content/content_common.gypi:532: ['OS=="ios"', {
On 2012/09/07 16:25:52, John Abd-El-Malek wrote:
> move this to 374 and combine

FWIW, I separated them on purpose. Almost everywhere Android did the
combination, it made things harder to find, and in several cases I had to break
things apart. I like making the "dependencies that everyone that iOS" uses as
prominent as possible in the file, so they are easy to find, and the unusual iOS
stuff at the end of the target, since it's least relevant to most people in the
file.

I can recombine them if you feel strongly it's better that way, but I definitely
find this more readable.

[jam, 2012-09-10 05:46:06]

https://codereview.chromium.org/10917130/diff/3001/content/content_common.gypi
File content/content_common.gypi (right):

https://codereview.chromium.org/10917130/diff/3001/content/content_common.gyp...
content/content_common.gypi:532: ['OS=="ios"', {
On 2012/09/07 17:03:41, stuartmorgan wrote:
> On 2012/09/07 16:25:52, John Abd-El-Malek wrote:
> > move this to 374 and combine
> 
> FWIW, I separated them on purpose. Almost everywhere Android did the
> combination, it made things harder to find, and in several cases I had to
break
> things apart. I like making the "dependencies that everyone that iOS" uses as
> prominent as possible in the file, so they are easy to find, and the unusual
iOS
> stuff at the end of the target, since it's least relevant to most people in
the
> file.
> 
> I can recombine them if you feel strongly it's better that way, but I
definitely
> find this more readable.

+mmentovai: do we have a convention for this sort of thing? if not, what do you
prefer?

[Mark Mentovai, 2012-09-10 12:54:41]

https://codereview.chromium.org/10917130/diff/3001/content/content_common.gypi
File content/content_common.gypi (right):

https://codereview.chromium.org/10917130/diff/3001/content/content_common.gyp...
content/content_common.gypi:532: ['OS=="ios"', {
John Abd-El-Malek wrote:
> On 2012/09/07 17:03:41, stuartmorgan wrote:
> > On 2012/09/07 16:25:52, John Abd-El-Malek wrote:
> > > move this to 374 and combine
> > 
> > FWIW, I separated them on purpose. Almost everywhere Android did the
> > combination, it made things harder to find, and in several cases I had to
> break
> > things apart. I like making the "dependencies that everyone that iOS" uses
as
> > prominent as possible in the file, so they are easy to find, and the unusual
> iOS
> > stuff at the end of the target, since it's least relevant to most people in
> the
> > file.
> > 
> > I can recombine them if you feel strongly it's better that way, but I
> definitely
> > find this more readable.
> 
> +mmentovai: do we have a convention for this sort of thing? if not, what do
you
> prefer?

Combine ’em. No sense in duplicating the same condition. This file already mixes
dependencies with other properties.

[stuartmorgan, 2012-09-10 13:22:46]

Done; PTAL. I updated content_browser.gypi to match that format as well so the
files are consistent.

[jam, 2012-09-10 15:14:35]

lgtm

[commit-bot: I haz the power, 2012-09-10 15:35:31]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/stuartmorgan@chromium.org/10917130/1006

[commit-bot: I haz the power, 2012-09-10 15:39:13]

Try job failure for 10917130-1006 (retry) on mac_rel for step "runhooks".
It's a second try, previously, step "runhooks" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[commit-bot: I haz the power, 2012-09-10 15:54:26]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/stuartmorgan@chromium.org/10917130/4002

[commit-bot: I haz the power, 2012-09-10 17:46:17]

Change committed as 155759