Never run errorprone on non-Chromium code.
If errorprone finds an error in non-Chromium code the build will fail. This shouldn't happen, so I am disabling errorprone on non-Chromium code. BUG= Review URL: https://codereview.chromium.org/1314493010 Cr-Original-Commit-Position: refs/heads/master@{#345941} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: bb9e4863c7dd58c17fd53cd025f7f0dad17a52a5
This commit is contained in:
Родитель
b960f421ef
Коммит
3fc4388c87
|
@ -1033,7 +1033,9 @@ template("compile_java") {
|
|||
}
|
||||
|
||||
_enable_errorprone = use_errorprone_java_compiler
|
||||
if (defined(invoker.enable_errorprone)) {
|
||||
if (!_chromium_code) {
|
||||
_enable_errorprone = false
|
||||
} else if (defined(invoker.enable_errorprone)) {
|
||||
_enable_errorprone = invoker.enable_errorprone
|
||||
}
|
||||
|
||||
|
|
|
@ -53,7 +53,12 @@
|
|||
'jar_path': '<(jar_dir)/<(jar_name)',
|
||||
'main_class%': '',
|
||||
'stamp': '<(intermediate_dir)/jar.stamp',
|
||||
'enable_errorprone%': '0',
|
||||
'conditions': [
|
||||
['chromium_code == 0', {
|
||||
'enable_errorprone': 0,
|
||||
}],
|
||||
],
|
||||
'enable_errorprone%': 0,
|
||||
'errorprone_exe_path': '<(PRODUCT_DIR)/bin.java/chromium_errorprone',
|
||||
},
|
||||
'all_dependent_settings': {
|
||||
|
|
|
@ -83,8 +83,6 @@
|
|||
'java_in_dir_suffix%': '/src',
|
||||
'proguard_config%': '',
|
||||
'proguard_preprocess%': '0',
|
||||
'enable_errorprone%': '0',
|
||||
'errorprone_exe_path': '<(PRODUCT_DIR)/bin.java/chromium_errorprone',
|
||||
'variables': {
|
||||
'variables': {
|
||||
'proguard_preprocess%': 0,
|
||||
|
@ -105,6 +103,13 @@
|
|||
},
|
||||
'emma_instrument': '<(emma_instrument)',
|
||||
'javac_jar_path': '<(javac_jar_path)',
|
||||
'conditions': [
|
||||
['chromium_code == 0', {
|
||||
'enable_errorprone': 0,
|
||||
}],
|
||||
],
|
||||
'enable_errorprone%': 0,
|
||||
'errorprone_exe_path': '<(PRODUCT_DIR)/bin.java/chromium_errorprone',
|
||||
},
|
||||
'conditions': [
|
||||
['add_to_dependents_classpaths == 1', {
|
||||
|
|
|
@ -223,7 +223,12 @@
|
|||
'native_lib_placeholders': [],
|
||||
'main_apk_name': '<(apk_name)',
|
||||
'dex_path': '<(dex_path)',
|
||||
'enable_errorprone%': '0',
|
||||
'conditions': [
|
||||
['chromium_code == 0', {
|
||||
'enable_errorprone': 0,
|
||||
}],
|
||||
],
|
||||
'enable_errorprone%': 0,
|
||||
'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
|
||||
|
|
Загрузка…
Ссылка в новой задаче