| Index: build/config/android/internal_rules.gni
|
| diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
|
| index ab773eae500ebbc3bf9d1a0968e0e0220837b841..0aa1932f1cb3e95868238ee93976fa4e4b876580 100644
|
| --- a/build/config/android/internal_rules.gni
|
| +++ b/build/config/android/internal_rules.gni
|
| @@ -719,6 +719,12 @@ template("compile_java") {
|
| if (defined(invoker.chromium_code)) {
|
| _chromium_code = invoker.chromium_code
|
| }
|
| +
|
| + _disable_errorprone = false
|
| + if (defined(invoker.disable_errorprone)) {
|
| + _disable_errorprone = invoker.disable_errorprone
|
| + }
|
| +
|
| _manifest_entries = []
|
| if (defined(invoker.manifest_entries)) {
|
| _manifest_entries = invoker.manifest_entries
|
| @@ -782,7 +788,15 @@ template("compile_java") {
|
| if (_chromium_code) {
|
| args += [ "--chromium-code=1" ]
|
| }
|
| -
|
| + if (_disable_errorprone) {
|
| + args += [ "--disable-errorprone" ]
|
| + } else {
|
| + deps += [ "//third_party/errorprone:chromium_errorprone" ]
|
| + args += [
|
| + "--errorprone-path",
|
| + "bin/chromium_errorprone",
|
| + ]
|
| + }
|
| args += rebase_path(_java_files, root_build_dir)
|
| }
|
|
|
| @@ -910,6 +924,9 @@ template("java_library_impl") {
|
| chromium_code = _chromium_code
|
| android = _requires_android
|
|
|
| + if (defined(invoker.disable_errorprone)) {
|
| + disable_errorprone = invoker.disable_errorprone
|
| + }
|
| if (defined(invoker.jar_excluded_patterns)) {
|
| jar_excluded_patterns = invoker.jar_excluded_patterns
|
| }
|
|
|