Disable webrtc for Android system build

Disable webrtc for Android system build

This should not affect upstream build configuration. This should only
affect build when building as part of the Android System build.

Disabling since we do not yet merge the necessary third_party
repositories so it is breaking downstream build.

dcommitted after all the bots have passed compile

BUG=161417
TBR=wjia@chromium.org

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

[boliu, 2013-01-12 07:41:31]

Downstream build fix that should not affect upstream, so going to dcommit when
the bots pass compile.

cc-ed some android people to notify that webrtc build was turned on for android

[wjia(left Chromium), 2013-01-12 15:16:19]

lgtm

[joth, 2013-01-12 18:20:01]

Wondering how to avoid this class of breakage... Shouldn't someone from
 the chrome android team have been copied on the original review?
https://codereview.chromium.org/11833022
Or did this get agreed with out of band communication, but the info not get
passed on to us?


Thanks for fixing it Bo


On 11 January 2013 23:41, <boliu@chromium.org> wrote:

> Reviewers: wjia,
>
> Message:
> Downstream build fix that should not affect upstream, so going to dcommit
> when
> the bots pass compile.
>
> cc-ed some android people to notify that webrtc build was turned on for
> android
>
> Description:
> Disable webrtc for Android system build
>
> This should not affect upstream build configuration. This should only
> affect build when building as part of the Android System build.
>
> Disabling since we do not yet merge the necessary third_party
> repositories so it is breaking downstream build.
>
> BUG=
> TBR=wjia@chromium.org
>
> Please review this at
https://codereview.chromium.**org/11884010/<https://codereview.chromium.org/1...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>   M build/common.gypi
>
>
> Index: build/common.gypi
> diff --git a/build/common.gypi b/build/common.gypi
> index ef268a88684dba18c798f90fd7a4f2**6f52c6c275..**
> e865e690c8d0c44cc8dc12b0a75b90**869762305e 100644
> --- a/build/common.gypi
> +++ b/build/common.gypi
> @@ -490,11 +490,21 @@
>            'enable_language_detection%': 0,
>            'enable_printing%': 0,
>            'enable_themes%': 0,
> -          'enable_webrtc%': 1,
>            'proprietary_codecs%': 1,
>            'remoting%': 0,
>          }],
>
> +        ['OS=="android" and android_build_type==0', {
> +          'enable_webrtc%': 1,
> +        }],
> +
> +        # Disable WebRTC for building WebView as part of Android system.
> +        # TODO(boliu): Decide if we want WebRTC, and if so, also merge
> +        # the necessary third_party repositories.
> +        ['OS=="android" and android_build_type==1', {
> +          'enable_webrtc%': 0,
> +        }],
> +
>          ['OS=="ios"', {
>            'configuration_policy%': 0,
>            'disable_ftp_support%': 1,
>
>
>

[Yaron, 2013-01-14 18:32:26]

On 2013/01/12 18:20:01, joth wrote:
> Wondering how to avoid this class of breakage... Shouldn't someone from
>  the chrome android team have been copied on the original review?
> https://codereview.chromium.org/11833022
> Or did this get agreed with out of band communication, but the info not get
> passed on to us?
> 
> 
> Thanks for fixing it Bo
> 
> 
> On 11 January 2013 23:41, <mailto:boliu@chromium.org> wrote:
> 
> > Reviewers: wjia,
> >
> > Message:
> > Downstream build fix that should not affect upstream, so going to dcommit
> > when
> > the bots pass compile.
> >
> > cc-ed some android people to notify that webrtc build was turned on for
> > android
> >
> > Description:
> > Disable webrtc for Android system build
> >
> > This should not affect upstream build configuration. This should only
> > affect build when building as part of the Android System build.
> >
> > Disabling since we do not yet merge the necessary third_party
> > repositories so it is breaking downstream build.
> >
> > BUG=
> > mailto:TBR=wjia@chromium.org
> >
> > Please review this at
>
https://codereview.chromium.**org/11884010/%3Chttps://codereview.chromium.org...>
> >
> > SVN Base:
>
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
> >
> > Affected files:
> >   M build/common.gypi
> >
> >
> > Index: build/common.gypi
> > diff --git a/build/common.gypi b/build/common.gypi
> > index ef268a88684dba18c798f90fd7a4f2**6f52c6c275..**
> > e865e690c8d0c44cc8dc12b0a75b90**869762305e 100644
> > --- a/build/common.gypi
> > +++ b/build/common.gypi
> > @@ -490,11 +490,21 @@
> >            'enable_language_detection%': 0,
> >            'enable_printing%': 0,
> >            'enable_themes%': 0,
> > -          'enable_webrtc%': 1,
> >            'proprietary_codecs%': 1,
> >            'remoting%': 0,
> >          }],
> >
> > +        ['OS=="android" and android_build_type==0', {
> > +          'enable_webrtc%': 1,
> > +        }],
> > +
> > +        # Disable WebRTC for building WebView as part of Android system.
> > +        # TODO(boliu): Decide if we want WebRTC, and if so, also merge
> > +        # the necessary third_party repositories.
> > +        ['OS=="android" and android_build_type==1', {
> > +          'enable_webrtc%': 0,
> > +        }],
> > +
> >          ['OS=="ios"', {
> >            'configuration_policy%': 0,
> >            'disable_ftp_support%': 1,
> >
> >
> >

Ideally someone from chrome android team should have been on the specific review
but, yes, it was discussed out of band and webview was missed. :(