| Index: build/host_jar.gypi
|
| diff --git a/build/host_jar.gypi b/build/host_jar.gypi
|
| index 9c35177872ce92e36fe42e872a2c55798e0b4d5d..5d5684de04eef48e2e539856683e7cd820dad8c6 100644
|
| --- a/build/host_jar.gypi
|
| +++ b/build/host_jar.gypi
|
| @@ -53,6 +53,8 @@
|
| 'jar_path': '<(jar_dir)/<(jar_name)',
|
| 'main_class%': '',
|
| 'stamp': '<(intermediate_dir)/jar.stamp',
|
| + 'disable_errorprone%': '0',
|
| + 'errorprone_exe_path': '<(PRODUCT_DIR)/bin.java/chromium_errorprone',
|
| },
|
| 'all_dependent_settings': {
|
| 'variables': {
|
| @@ -75,7 +77,16 @@
|
| }],
|
| ['main_class != ""', {
|
| 'extra_options': ['--main-class=>(main_class)']
|
| - }]
|
| + }],
|
| + ['disable_errorprone == 0', {
|
| + 'extra_inputs': [
|
| + '<(errorprone_exe_path)',
|
| + ],
|
| + 'extra_options': [ '--errorprone-path=<(errorprone_exe_path)' ],
|
| + }, {
|
| + 'extra_inputs': [],
|
| + 'extra_options': [ '--disable-errorprone' ],
|
| + }],
|
| ],
|
| },
|
| 'inputs': [
|
| @@ -83,6 +94,7 @@
|
| '<(DEPTH)/build/android/gyp/javac.py',
|
| '^@(java_sources)',
|
| '>@(input_jars_paths)',
|
| + '<@(extra_inputs)',
|
| ],
|
| 'outputs': [
|
| '<(jar_path)',
|
| @@ -128,4 +140,3 @@
|
| }]
|
| ]
|
| }
|
| -
|
|
|