Index: build/java_apk.gypi |
diff --git a/build/java_apk.gypi b/build/java_apk.gypi |
index 2af3a8a83fda67430e21d85e9857f6492e8f055f..506e699b4eff008b941a0a97b223b1033c094103 100644 |
--- a/build/java_apk.gypi |
+++ b/build/java_apk.gypi |
@@ -180,6 +180,8 @@ |
'extra_native_libs': [], |
'native_lib_placeholder_stamp': '<(apk_package_native_libs_dir)/<(android_app_abi)/native_lib_placeholder.stamp', |
'native_lib_placeholders': [], |
+ 'disable_errorprone%': '0', |
jbudorick
2015/05/07 18:49:27
If errorprone is enabled, this should add the erro
raywilliams_chromium
2015/05/11 19:52:25
added the condition
raywilliams_chromium
2015/05/11 19:52:25
Done.
|
+ 'errorprone_exe_path': '<(PRODUCT_DIR)/bin.java/chromium_errorprone', |
}, |
# Pass the jar path to the apk's "fake" jar target. This would be better as |
# direct_dependent_settings, but a variable set by a direct_dependent_settings |
@@ -668,7 +670,17 @@ |
# targets use the same java_in_dir and both use java_apk.gypi or |
# both use java.gypi.) |
'java_sources': ['>!@(find >(java_in_dir)>(java_in_dir_suffix) >(additional_src_dirs) -name "*.java" # apk)'], |
- |
+ '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', |
@@ -676,6 +688,7 @@ |
'>@(java_sources)', |
'>@(input_jars_paths)', |
'<(codegen_stamp)', |
+ '<@(extra_inputs)', |
], |
'conditions': [ |
['native_lib_target != ""', { |
@@ -695,6 +708,7 @@ |
'--jar-path=<(javac_jar_path)', |
'--jar-excluded-classes=<(jar_excluded_classes)', |
'--stamp=<(compile_stamp)', |
+ '<@(extra_args)', |
'>@(java_sources)', |
], |
}, |
@@ -806,6 +820,7 @@ |
'--input-jars-paths=>(proguard_input_jar_paths)', |
'--proguard-configs=>(proguard_flags_paths)', |
+ |
'--test-jar-path', '<(test_jar_path)', |
'--obfuscated-jar-path', '<(obfuscated_jar_path)', |