--- jsr166/build.xml	2018/01/23 04:59:10	1.262
+++ jsr166/build.xml	2018/01/24 01:11:10	1.264
@@ -1402,25 +1402,24 @@
 =================================================================== -->
   <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
   <property name="errorprone.jsr166.flags"
-            value="-Xep:BoxedPrimitiveConstructor:OFF
-                   -Xep:HashtableContains:OFF
+            value="-Xep:HashtableContains:OFF
                    -Xep:JdkObsolete:OFF
-                   -Xep:ModifyingCollectionWithItself:OFF
                    -Xep:MissingOverride:OFF
                    -Xep:MissingFail:OFF
-                   -Xep:IdentityBinaryExpression:WARN
-                   -Xep:MethodCanBeStatic:WARN"/>
-  <!-- -Xep:WildcardImport:ERROR -->
-  <property name="errorprone.jsr166.test.flags"
-            value="-Xep:MissingOverride:OFF
-                   -Xep:StringSplitter:OFF
                    -Xep:MixedArrayDimensions:ERROR
                    -Xep:RemoveUnusedImports:ERROR
-                   -Xep:LongLiteralLowerCaseSuffix:ERROR
-                   -Xep:RedundantThrows:ERROR
                    -Xep:EmptyIf:ERROR
                    -Xep:MultipleTopLevelClasses:ERROR
-                   -Xep:ClassName:ERROR"/>
+                   -Xep:ClassName:ERROR
+                   -Xep:LongLiteralLowerCaseSuffix:ERROR
+                   -Xep:RedundantThrows:ERROR
+                   -Xep:IdentityBinaryExpression:WARN
+                   -Xep:MethodCanBeStatic:WARN"/>
+  <!-- -Xep:WildcardImport:ERROR -->
+  <property name="errorprone.jsr166.test.flags"
+            value="-Xep:StringSplitter:OFF
+                   -Xep:BoxedPrimitiveConstructor:OFF
+                   -Xep:ModifyingCollectionWithItself:OFF"/>
   <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
   <target name="errorprone"
           depends="clean, configure-compiler"
@@ -1443,6 +1442,7 @@
            fork="true">
 
       <include name="**/*.java"/>
+      <compilerarg value="-XDcompilePolicy=simple"/>
       <compilerarg line="-processorpath ${errorprone.jar}"/>
       <compilerarg value="-Xplugin:ErrorProne
                           ${errorprone.jsr166.flags}"/>
@@ -1464,6 +1464,7 @@
       workdir="${build.dir}"
       classes="${product.jar}">
       <javac-elements>
+        <compilerarg value="-XDcompilePolicy=simple"/>
         <compilerarg line="-processorpath ${errorprone.jar}"/>
         <compilerarg value="-Xplugin:ErrorProne
                             ${errorprone.jsr166.flags}
@@ -1485,7 +1486,7 @@
        classes="${product.jar}"
        verbose="all">
       <jtreg-elements>
-        <arg value="-javacoption:-XDcompilePolicy=byfile"/>
+        <arg value="-javacoption:-XDcompilePolicy=simple"/>
         <arg value="-javacoption:-processorpath"/>
         <arg value="-javacoption:${errorprone.jar}"/>
         <arg value="-javacoption:-Xplugin:ErrorProne