Disable Java Annotation Processing by default

commit_hash:b1d2bd3f39ea9039fb7bd70d18f20ff7cad737d2

2 files changed, 7 insertions, 6 deletions

diff --git a/build/scripts/build_java_with_error_prone2.py b/build/scripts/build_java_with_error_prone2.py
index bef398bced2..ba86ff02edc 100644
--- a/build/scripts/build_java_with_error_prone2.py
+++ b/build/scripts/build_java_with_error_prone2.py
@@ -36,16 +36,17 @@ def parse_args(argv):
     return parsed + [argv[i + 1 :]]
 
 
-def fix_cmd_line(error_prone_tool, cmd):
+def add_error_prone_to_cmd(error_prone_tool, cmd):
     if not error_prone_tool:
         return cmd
     error_prone_flags = []
-    for f in cmd:
+    cmd_wo_epf = []
+    for f in cmd:  # divide list to error_prone flags and others
         if f.startswith('-Xep'):
             error_prone_flags.append(f)
-    for f in error_prone_flags:
-        if f in cmd:
-            cmd.remove(f)
+        elif '-proc:none' != f:  # Remove disabling AP when error_prone present
+            cmd_wo_epf.append(f)
+    cmd = cmd_wo_epf
     if '-processor' in cmd:
         classpath = get_classpath(cmd)
         if classpath:
diff --git a/build/scripts/run_javac.py b/build/scripts/run_javac.py
index 79a82a1f704..a65312cf4ac 100644
--- a/build/scripts/run_javac.py
+++ b/build/scripts/run_javac.py
@@ -58,7 +58,7 @@ def main():
         cmd = java_tmpdir.fix_tmpdir(cmd)
 
     if opts.error_prone:
-        cmd = java_error_prone.fix_cmd_line(opts.error_prone, cmd)
+        cmd = java_error_prone.add_error_prone_to_cmd(opts.error_prone, cmd)
 
     with open(opts.sources_list) as f:
         input_files = f.read().strip().split()