Fix merge error

This commit is contained in:
Weimin Yu 2019-06-17 13:28:47 -04:00
parent fb0715e3e2
commit 9ee60a8fd9

View file

@ -21,7 +21,6 @@ tasks.withType(JavaCompile).configureEach {
if (System.getProperty('no_werror') != 'true') { if (System.getProperty('no_werror') != 'true') {
options.compilerArgs << "-Werror" options.compilerArgs << "-Werror"
} }
options.compilerArgs << "-Werror"
options.errorprone.disableWarningsInGeneratedCode = true options.errorprone.disableWarningsInGeneratedCode = true
options.errorprone.errorproneArgumentProviders.add([ options.errorprone.errorproneArgumentProviders.add([
asArguments: { asArguments: {