[Android] Make build output a little quieter.

[Android] Make build output a little quieter.

Suppress warnings from jsr305 by only enabling some warnings for chromium_code.
Also fixes the fact that components code wasn't setting chromium_code


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

[Yaron, 2013-03-22 01:50:52]

joi: components
cjhopman: the rest

[Jói, 2013-03-22 07:55:25]

For //components, the chromium_code bit also gets added in pending
change https://codereview.chromium.org/12902030/.  I'm not sure which
change might land first, but if you want to avoid merge pain (yours or
mine :) then perhaps you want to skip this bit?

Cheers,
Jói


On Fri, Mar 22, 2013 at 1:50 AM,  <yfriedman@chromium.org> wrote:
> Reviewers: Jói, cjhopman,
>
> Message:
> joi: components
> cjhopman: the rest
>
> Description:
> [Android] Make build output a little quieter.
>
> Suppress warnings from jsr305 by only enabling some warnings for
> chromium_code.
> Also fixes the fact that components code wasn't setting chromium_code
>
>
> Please review this at https://codereview.chromium.org/12702017/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files:
>   M build/android/javac.py
>   M build/java.gypi
>   M components/components.gyp
>
>
> Index: build/android/javac.py
> diff --git a/build/android/javac.py b/build/android/javac.py
> index
>
1ba5d064f8d18a5ee86c12aa1b5e996b41ddc52f..6117a5758caa73bfb173baecdecb7e29ef023fed
> 100755
> --- a/build/android/javac.py
> +++ b/build/android/javac.py
> @@ -41,16 +41,23 @@ def DoJavac(options):
>    build_utils.DeleteDirectory(output_dir)
>    build_utils.MakeDirectory(output_dir)
>
> -  subprocess.check_call([
> +  cmd = [
>        'javac',
>        '-g',
> -      '-Xlint:unchecked',
>        '-source', '1.5',
>        '-target', '1.5',
>        '-classpath', ':'.join(classpath),
> -      '-d', output_dir] +
> -      java_files)
> +      '-d', output_dir]
>
> +  # Only output Java warnings for chromium code
> +  if options.chromium_code:
> +    cmd += ['-Xlint:unchecked']
> +  else:
> +    cmd += [# Suppress "Sun proprietary API" warnings. See:
> +            #
>
http://stackoverflow.com/questions/1136659/how-can-i-suppress-java-compiler-w...
> +            '-XDignore.symbol.file']
> +
> +  subprocess.check_call(cmd + java_files)
>
>  def main(argv):
>    parser = optparse.OptionParser()
> @@ -61,6 +68,9 @@ def main(argv):
>    parser.add_option('--classpath', help='Classpath for javac.')
>    parser.add_option('--output-dir', help='Directory for javac output.')
>    parser.add_option('--stamp', help='Path to touch on success.')
> +  parser.add_option('--chromium-code', type='int', help='Whether code
> being'
> +                    'compiled should be built with stricter warnings for '
> +                    'chromium code.')
>
>    # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.
>    parser.add_option('--ignore', help='Ignored.')
> Index: build/java.gypi
> diff --git a/build/java.gypi b/build/java.gypi
> index
>
2758cd17256b7567e418c86aa1a595f2dcd70082..d6a28f91dd089ee66eff9924659b35be1271dadc
> 100644
> --- a/build/java.gypi
> +++ b/build/java.gypi
> @@ -179,6 +179,7 @@
>          '--classpath=>(input_jars_paths)',
>          '--src-dirs=>(all_src_dirs)',
>          '--javac-includes=<(javac_includes)',
> +        '--chromium-code=<(chromium_code)',
>          '--stamp=<(compile_stamp)',
>
>          # TODO(newt): remove this once http://crbug.com/177552 is fixed in
> ninja.
> Index: components/components.gyp
> diff --git a/components/components.gyp b/components/components.gyp
> index
>
cc385a0f60929551213104b172ba14c090d0a83b..c6a43482c1e1eb4d80d503b94dfbfc0ef6368f85
> 100644
> --- a/components/components.gyp
> +++ b/components/components.gyp
> @@ -3,6 +3,9 @@
>  # found in the LICENSE file.
>
>  {
> +  'variables': {
> +    'chromium_code': 1,
> +  },
>    'includes': [
>      'autofill.gypi',
>      'auto_login_parser.gypi',
>
>

[Jói, 2013-03-22 07:55:46]

(but LGTM if you wish to land it this way)

On Fri, Mar 22, 2013 at 7:54 AM, Jói Sigurðsson <joi@chromium.org> wrote:
> For //components, the chromium_code bit also gets added in pending
> change https://codereview.chromium.org/12902030/.  I'm not sure which
> change might land first, but if you want to avoid merge pain (yours or
> mine :) then perhaps you want to skip this bit?
>
> Cheers,
> Jói
>
>
> On Fri, Mar 22, 2013 at 1:50 AM,  <yfriedman@chromium.org> wrote:
>> Reviewers: Jói, cjhopman,
>>
>> Message:
>> joi: components
>> cjhopman: the rest
>>
>> Description:
>> [Android] Make build output a little quieter.
>>
>> Suppress warnings from jsr305 by only enabling some warnings for
>> chromium_code.
>> Also fixes the fact that components code wasn't setting chromium_code
>>
>>
>> Please review this at https://codereview.chromium.org/12702017/
>>
>> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>>
>> Affected files:
>>   M build/android/javac.py
>>   M build/java.gypi
>>   M components/components.gyp
>>
>>
>> Index: build/android/javac.py
>> diff --git a/build/android/javac.py b/build/android/javac.py
>> index
>>
1ba5d064f8d18a5ee86c12aa1b5e996b41ddc52f..6117a5758caa73bfb173baecdecb7e29ef023fed
>> 100755
>> --- a/build/android/javac.py
>> +++ b/build/android/javac.py
>> @@ -41,16 +41,23 @@ def DoJavac(options):
>>    build_utils.DeleteDirectory(output_dir)
>>    build_utils.MakeDirectory(output_dir)
>>
>> -  subprocess.check_call([
>> +  cmd = [
>>        'javac',
>>        '-g',
>> -      '-Xlint:unchecked',
>>        '-source', '1.5',
>>        '-target', '1.5',
>>        '-classpath', ':'.join(classpath),
>> -      '-d', output_dir] +
>> -      java_files)
>> +      '-d', output_dir]
>>
>> +  # Only output Java warnings for chromium code
>> +  if options.chromium_code:
>> +    cmd += ['-Xlint:unchecked']
>> +  else:
>> +    cmd += [# Suppress "Sun proprietary API" warnings. See:
>> +            #
>>
http://stackoverflow.com/questions/1136659/how-can-i-suppress-java-compiler-w...
>> +            '-XDignore.symbol.file']
>> +
>> +  subprocess.check_call(cmd + java_files)
>>
>>  def main(argv):
>>    parser = optparse.OptionParser()
>> @@ -61,6 +68,9 @@ def main(argv):
>>    parser.add_option('--classpath', help='Classpath for javac.')
>>    parser.add_option('--output-dir', help='Directory for javac output.')
>>    parser.add_option('--stamp', help='Path to touch on success.')
>> +  parser.add_option('--chromium-code', type='int', help='Whether code
>> being'
>> +                    'compiled should be built with stricter warnings for '
>> +                    'chromium code.')
>>
>>    # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.
>>    parser.add_option('--ignore', help='Ignored.')
>> Index: build/java.gypi
>> diff --git a/build/java.gypi b/build/java.gypi
>> index
>>
2758cd17256b7567e418c86aa1a595f2dcd70082..d6a28f91dd089ee66eff9924659b35be1271dadc
>> 100644
>> --- a/build/java.gypi
>> +++ b/build/java.gypi
>> @@ -179,6 +179,7 @@
>>          '--classpath=>(input_jars_paths)',
>>          '--src-dirs=>(all_src_dirs)',
>>          '--javac-includes=<(javac_includes)',
>> +        '--chromium-code=<(chromium_code)',
>>          '--stamp=<(compile_stamp)',
>>
>>          # TODO(newt): remove this once http://crbug.com/177552 is fixed in
>> ninja.
>> Index: components/components.gyp
>> diff --git a/components/components.gyp b/components/components.gyp
>> index
>>
cc385a0f60929551213104b172ba14c090d0a83b..c6a43482c1e1eb4d80d503b94dfbfc0ef6368f85
>> 100644
>> --- a/components/components.gyp
>> +++ b/components/components.gyp
>> @@ -3,6 +3,9 @@
>>  # found in the LICENSE file.
>>
>>  {
>> +  'variables': {
>> +    'chromium_code': 1,
>> +  },
>>    'includes': [
>>      'autofill.gypi',
>>      'auto_login_parser.gypi',
>>
>>

[cjhopman, 2013-04-01 20:33:13]

lgtm

https://codereview.chromium.org/12702017/diff/1/build/android/javac.py
File build/android/javac.py (right):

https://codereview.chromium.org/12702017/diff/1/build/android/javac.py#newcode71
build/android/javac.py:71: parser.add_option('--chromium-code', type='int',
help='Whether code being'
Nit: space at end of string

[Yaron, 2013-04-01 20:47:42]

Done and rebased.

[commit-bot: I haz the power, 2013-04-01 20:48:10]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yfriedman@chromium.org/12702017/6002

[commit-bot: I haz the power, 2013-04-01 20:52:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yfriedman@chromium.org/12702017/17001

[commit-bot: I haz the power, 2013-04-01 23:52:45]

Change committed as 191706