| Index: build/java.gypi
|
| diff --git a/build/java.gypi b/build/java.gypi
|
| index 730fa2222a7417c1684ea6f23a40e17b058d4cb7..3e72cab5bcbd05683b5b12ac018f0240e81e2e1a 100644
|
| --- a/build/java.gypi
|
| +++ b/build/java.gypi
|
| @@ -81,6 +81,8 @@
|
| 'run_findbugs%': 0,
|
| 'proguard_config%': '',
|
| 'proguard_preprocess%': '0',
|
| + 'disable_errorprone%': '0',
|
| + 'errorprone_exe_path': '<(PRODUCT_DIR)/bin.java/chromium_errorprone',
|
| 'variables': {
|
| 'variables': {
|
| 'proguard_preprocess%': 0,
|
| @@ -251,6 +253,17 @@
|
| 'message': 'Compiling <(_target_name) java sources',
|
| 'variables': {
|
| 'java_sources': ['>!@(find >(java_in_dir)/src >(additional_src_dirs) -name "*.java")'],
|
| + 'conditions': [
|
| + ['disable_errorprone == 0', {
|
| + 'extra_inputs': [
|
| + '<(errorprone_exe_path)',
|
| + ],
|
| + 'extra_args': [ '--errorprone-path=<(errorprone_exe_path)' ],
|
| + }, {
|
| + 'extra_inputs': [],
|
| + 'extra_args': [ '--disable-errorprone' ],
|
| + }],
|
| + ],
|
| },
|
| 'inputs': [
|
| '<(DEPTH)/build/android/gyp/util/build_utils.py',
|
| @@ -258,6 +271,7 @@
|
| '>@(java_sources)',
|
| '>@(input_jars_paths)',
|
| '>@(additional_input_paths)',
|
| + '<@(extra_inputs)',
|
| ],
|
| 'outputs': [
|
| '<(compile_stamp)',
|
| @@ -272,6 +286,7 @@
|
| '--jar-path=<(javac_jar_path)',
|
| '--jar-excluded-classes=<(jar_excluded_classes)',
|
| '--stamp=<(compile_stamp)',
|
| + '<@(extra_args)',
|
| '>@(java_sources)',
|
| ]
|
| },
|
|
|