diff options
| -rwxr-xr-x | build/android/javac.py | 17 | ||||
| -rw-r--r-- | build/java.gypi | 1 | ||||
| -rw-r--r-- | build/java_apk.gypi | 1 |
3 files changed, 15 insertions, 4 deletions
diff --git a/build/android/javac.py b/build/android/javac.py index 9adf566..2b19185 100755 --- a/build/android/javac.py +++ b/build/android/javac.py @@ -40,16 +40,22 @@ def DoJavac(options): build_utils.DeleteDirectory(output_dir) build_utils.MakeDirectory(output_dir) - build_utils.CheckCallDie([ + 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: goo.gl/OYxUM + '-XDignore.symbol.file'] + + build_utils.CheckCallDie(cmd + java_files) def main(argv): parser = optparse.OptionParser() @@ -60,6 +66,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.') diff --git a/build/java.gypi b/build/java.gypi index 967b444..1bc952a 100644 --- a/build/java.gypi +++ b/build/java.gypi @@ -201,6 +201,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. diff --git a/build/java_apk.gypi b/build/java_apk.gypi index 8d57be8..d1ea1cd 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -309,6 +309,7 @@ '--classpath=>(input_jars_paths) <(android_sdk_jar)', '--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. |