Remove local build fixes that were merged with ECH feature branch (#1395)

Author: mnbogner

android/lint.xml

@@ -28,10 +28,4 @@
     <issue id="Assert">
         <ignore path="**/common/src/main/java/org/conscrypt/OpenSSLCipherChaCha20.java" />
     </issue>
-
-    <!-- Workaround for "Unexpected failure during lint analysis". -->
-    <issue id="LintError">
-        <ignore regexp=".*module-info\.class.*"/>
-    </issue>
-
 </lint>

common/src/jni/main/cpp/conscrypt/native_crypto.cc

@@ -7835,12 +7835,7 @@ static int sslSelect(JNIEnv* env, int type, jobject fdObject, AppData* appData,
         if (fds[1].revents & POLLIN) {
             char token;
             do {
-                // TEMP - fixes build error
-                int foo = 0;
-                foo = read(appData->fdsEmergency[0], &token, 1);
-                if (foo > 0) {
-                    CONSCRYPT_LOG_VERBOSE("FOO: %d", foo);
-                }
+                (void)read(appData->fdsEmergency[0], &token, 1);
             } while (errno == EINTR);
         }
     }
@@ -7871,12 +7866,7 @@ static void sslNotify(AppData* appData) {
     char token = '*';
     do {
         errno = 0;
-        // TEMP - fixes build error
-        int foo = 0;
-        foo = write(appData->fdsEmergency[1], &token, 1);
-        if (foo > 0) {
-            CONSCRYPT_LOG_VERBOSE("FOO: %d", foo);
-        }
+        (void)write(appData->fdsEmergency[1], &token, 1);
     } while (errno == EINTR);
     errno = errnoBackup;
 #endif

openjdk/build.gradle

@@ -350,15 +350,6 @@ def testInterop = tasks.register("testInterop", Test) {
 }
 check.dependsOn testInterop
 
-// Added to see results of new ECH tests when running tests from the command line
-tasks.withType(Test).configureEach {
-    testLogging {
-        exceptionFormat "full"
-        events "started", "skipped", "passed", "failed"
-        showStandardStreams true
-    }
-}
-
 jacocoTestReport {
     additionalSourceDirs.from files("$rootDir/openjdk/src/test/java", "$rootDir/common/src/main/java")
     executionData tasks.withType(Test)