Index: build/host_jar.gypi |
diff --git a/build/host_jar.gypi b/build/host_jar.gypi |
index 9c35177872ce92e36fe42e872a2c55798e0b4d5d..d763691d1605f901bff811290d6578c0ca3e0d89 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', |
jbudorick
2015/05/15 18:37:12
nit: rename as enable_errorprone
raywilliams_chromium
2015/05/18 19:53:24
Done.
|
+ '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', { |
jbudorick
2015/05/15 18:37:12
er... if disable_errorprone is 0, you're passing -
raywilliams_chromium
2015/05/18 19:53:24
Fixed
raywilliams_chromium
2015/05/18 19:53:24
Done.
|
+ 'extra_inputs': [ |
+ '<(errorprone_exe_path)', |
+ ], |
+ 'extra_options': [ '--errorprone-path=<(errorprone_exe_path)' ], |
+ }, { |
+ 'extra_inputs': [], |
+ 'extra_options': [ '--enable-errorprone' ], |
+ }], |
], |
}, |
'inputs': [ |
@@ -83,6 +94,7 @@ |
'<(DEPTH)/build/android/gyp/javac.py', |
'^@(java_sources)', |
'>@(input_jars_paths)', |
+ '<@(extra_inputs)', |
], |
'outputs': [ |
'<(jar_path)', |