Don't enable ErrorProne in tests, if errorprone in main. Disable ErrorProne in tests, if ErrorProne in main only

Don't enable ErrorProne in tests, if errorprone in main. Disable ErrorProne in tests, if ErrorProne in main only
commit_hash:ce94862ec87a3a24b6dfb5d6bc794a6b019bbb57

Author: dimdim1177

build/export_generators/ide-gradle/javac_flags.jinja

@@ -1,4 +1,4 @@
-{%- macro JavacFlags(task, target_javac_flags, has_errorprone) -%}
+{%- macro JavacFlags(task, target_javac_flags, has_errorprone, dis_errorprone) -%}
 {%-     set target_javac_flags = target_javac_flags|unique -%}
 {%-     set javac_flags = [] -%}
 {%-     set compiler_jvm_flags = [] -%}
@@ -71,11 +71,13 @@ tasks.{{ task }}.configure {
 {%-                     endif -%}
 {%-                 endfor -%}
 {%-             endif -%}
+{%-         elif dis_errorprone %}
+    options.errorprone.isEnabled.set(false)
 {%-         endif %}
 }
 {%      endif -%}
 {%  endmacro -%}
 {#- glue -#}
-{{ JavacFlags("compileJava", target.javac.flags, with_errorprone) }}
+{{ JavacFlags("compileJava", target.javac.flags, with_errorprone, false) }}
 {#- glue -#}
-{{ JavacFlags("compileTestJava", all_targets|selectattr('javac')|map(attribute='javac')|selectattr('flags')|map(attribute='flags')|sum, with_errorprone or with_test_errorprone) }}
+{{ JavacFlags("compileTestJava", all_targets|selectattr('javac')|map(attribute='javac')|selectattr('flags')|map(attribute='flags')|sum, with_test_errorprone, with_errorprone) }}

build/export_generators/ide-gradle/vars.jinja

@@ -28,7 +28,7 @@
 
 {#- ErrorProne -#}
 {%- set with_errorprone = not(disable_errorprone) and (target.use_errorprone) and (target.consumer|selectattr('jar', 'startsWith', 'contrib/java/com/google/errorprone/error_prone_annotations')|length) -%}
-{%- set with_test_errorprone = not(disable_errorprone) and (extra_targets|selectattr('use_errorprone', 'eq', true)|length) and (extra_targets|selectattr('consumer')|map(attribute='consumer')|sum|selectattr('jar', 'startsWith', 'contrib/java/com/google/errorprone/error_prone_annotations')|length) -%}
+{%- set with_test_errorprone = not(disable_errorprone) and not(disable_test_errorprone) and (extra_targets|selectattr('use_errorprone', 'eq', true)|length) and (extra_targets|selectattr('consumer')|map(attribute='consumer')|sum|selectattr('jar', 'startsWith', 'contrib/java/com/google/errorprone/error_prone_annotations')|length) -%}
 {%- if with_errorprone or with_test_errorprone -%}
 {%-     set errorprones = all_targets|selectattr('consumer')|map(attribute='consumer')|sum|selectattr('classpath')|selectattr('jar', 'startsWith', 'contrib/java/com/google/errorprone/error_prone_annotations')|unique -%}
 {%- endif -%}