Fix build breakage on chrome-for-tv

Fix build breakage on chrome-for-tv

Since chrome-for-tv is using pepper plugins while based on Android.
we should add some files necessary for pepper plugins to |sources|,
when pepper plugin is enabled on android.

BUG=

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=222561

[kjyoun, 2013-09-05 05:06:56]

PTAL

[ycheo (away), 2013-09-05 05:26:02]

https://codereview.chromium.org/23978005/diff/4001/chrome/chrome_common.gypi
File chrome/chrome_common.gypi (right):

https://codereview.chromium.org/23978005/diff/4001/chrome/chrome_common.gypi#...
chrome/chrome_common.gypi:593: ['enable_plugins!=1', {
2 spaces for the indentation.

https://codereview.chromium.org/23978005/diff/4001/content/content_common.gypi
File content/content_common.gypi (right):

https://codereview.chromium.org/23978005/diff/4001/content/content_common.gyp...
content/content_common.gypi:431: ['enable_plugins!=1', {
2 spaces for the indentation.

[kjyoun, 2013-09-05 06:26:50]

https://codereview.chromium.org/23978005/diff/4001/chrome/chrome_common.gypi
File chrome/chrome_common.gypi (right):

https://codereview.chromium.org/23978005/diff/4001/chrome/chrome_common.gypi#...
chrome/chrome_common.gypi:593: ['enable_plugins!=1', {
On 2013/09/05 05:26:02, Yuncheol Heo wrote:
> 2 spaces for the indentation.

Done.

https://codereview.chromium.org/23978005/diff/4001/content/content_common.gypi
File content/content_common.gypi (right):

https://codereview.chromium.org/23978005/diff/4001/content/content_common.gyp...
content/content_common.gypi:431: ['enable_plugins!=1', {
On 2013/09/05 05:26:02, Yuncheol Heo wrote:
> 2 spaces for the indentation.

Done.

[ycheo (away), 2013-09-05 07:03:39]

lgtm

[anton1, 2013-09-06 09:47:07]

On 2013/09/05 07:03:39, Yuncheol Heo wrote:
> lgtm

lgtm

[kjyoun, 2013-09-06 10:01:58]

@jam

Can you review this CL?

[jam, 2013-09-06 16:22:51]

https://codereview.chromium.org/23978005/diff/10001/chrome/chrome_common.gypi
File chrome/chrome_common.gypi (right):

https://codereview.chromium.org/23978005/diff/10001/chrome/chrome_common.gypi...
chrome/chrome_common.gypi:592: 'conditions': [
nit: no need to have a nested conditions section here, just pull this out to be
at the same level as "os==android" above. this would also make it work correctly
if a platform other than android is disabling plugins

https://codereview.chromium.org/23978005/diff/10001/content/content_common.gypi
File content/content_common.gypi (right):

https://codereview.chromium.org/23978005/diff/10001/content/content_common.gy...
content/content_common.gypi:431: ['enable_plugins!=1', {
ditto

https://codereview.chromium.org/23978005/diff/10001/content/content_renderer....
File content/content_renderer.gypi (right):

https://codereview.chromium.org/23978005/diff/10001/content/content_renderer....
content/content_renderer.gypi:546: ['enable_plugins!=1', {
ditto

[kjyoun, 2013-09-09 00:13:45]

https://codereview.chromium.org/23978005/diff/10001/chrome/chrome_common.gypi
File chrome/chrome_common.gypi (right):

https://codereview.chromium.org/23978005/diff/10001/chrome/chrome_common.gypi...
chrome/chrome_common.gypi:592: 'conditions': [
chrome-for-tv is based on the Android (meaning that OS=="android"), not a
separate platform. Rather, it's basically chrome-for-android built with a little
bit different options. (such as enable_plugins).

On 2013/09/06 16:22:51, jam wrote:
> nit: no need to have a nested conditions section here, just pull this out to
be
> at the same level as "os==android" above. this would also make it work
correctly
> if a platform other than android is disabling plugins

[jam, 2013-09-09 14:57:32]

https://codereview.chromium.org/23978005/diff/10001/chrome/chrome_common.gypi
File chrome/chrome_common.gypi (right):

https://codereview.chromium.org/23978005/diff/10001/chrome/chrome_common.gypi...
chrome/chrome_common.gypi:592: 'conditions': [
Yes I understand that part, but what you're fixing is the config of
enable_plugins. since so far it's just been disabled on android, incorrectly
some files that shouldn't be listed for enable_plugins==0 get put in an
android==1 instead. 

On 2013/09/09 00:13:45, kjyoun wrote:
> chrome-for-tv is based on the Android (meaning that OS=="android"), not a
> separate platform. Rather, it's basically chrome-for-android built with a
little
> bit different options. (such as enable_plugins).
> 
> On 2013/09/06 16:22:51, jam wrote:
> > nit: no need to have a nested conditions section here, just pull this out to
> be
> > at the same level as "os==android" above. this would also make it work
> correctly
> > if a platform other than android is disabling plugins
>

[kjyoun, 2013-09-10 02:21:25]

https://codereview.chromium.org/23978005/diff/10001/chrome/chrome_common.gypi
File chrome/chrome_common.gypi (right):

https://codereview.chromium.org/23978005/diff/10001/chrome/chrome_common.gypi...
chrome/chrome_common.gypi:592: 'conditions': [
Got it and done!
On 2013/09/09 14:57:33, jam wrote:
> Yes I understand that part, but what you're fixing is the config of
> enable_plugins. since so far it's just been disabled on android, incorrectly
> some files that shouldn't be listed for enable_plugins==0 get put in an
> android==1 instead. 
> 
> On 2013/09/09 00:13:45, kjyoun wrote:
> > chrome-for-tv is based on the Android (meaning that OS=="android"), not a
> > separate platform. Rather, it's basically chrome-for-android built with a
> little
> > bit different options. (such as enable_plugins).
> > 
> > On 2013/09/06 16:22:51, jam wrote:
> > > nit: no need to have a nested conditions section here, just pull this out
to
> > be
> > > at the same level as "os==android" above. this would also make it work
> > correctly
> > > if a platform other than android is disabling plugins
> > 
>

https://codereview.chromium.org/23978005/diff/10001/content/content_common.gypi
File content/content_common.gypi (right):

https://codereview.chromium.org/23978005/diff/10001/content/content_common.gy...
content/content_common.gypi:431: ['enable_plugins!=1', {
On 2013/09/06 16:22:51, jam wrote:
> ditto

Done.

https://codereview.chromium.org/23978005/diff/10001/content/content_renderer....
File content/content_renderer.gypi (right):

https://codereview.chromium.org/23978005/diff/10001/content/content_renderer....
content/content_renderer.gypi:546: ['enable_plugins!=1', {
On 2013/09/06 16:22:51, jam wrote:
> ditto

Done.

[jam, 2013-09-10 15:36:35]

lgtm

https://codereview.chromium.org/23978005/diff/31001/content/content_common.gypi
File content/content_common.gypi (right):

https://codereview.chromium.org/23978005/diff/31001/content/content_common.gy...
content/content_common.gypi:485: 'common/sandbox_util.cc',
nit: order

[kjyoun, 2013-09-10 22:49:34]

https://codereview.chromium.org/23978005/diff/31001/content/content_common.gypi
File content/content_common.gypi (right):

https://codereview.chromium.org/23978005/diff/31001/content/content_common.gy...
content/content_common.gypi:485: 'common/sandbox_util.cc',
On 2013/09/10 15:36:35, jam wrote:
> nit: order

Done.

[commit-bot: I haz the power, 2013-09-10 22:52:47]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kjyoun@google.com/23978005/38001

[commit-bot: I haz the power, 2013-09-11 15:18:31]

Change committed as 222561