Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tweksteen merged 1 commit into from
Oct 1, 2025
+2 −27
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions android/lint.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
14 changes: 2 additions & 12 deletions common/src/jni/main/cpp/conscrypt/native_crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down Expand Up @@ -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
Expand Down
9 changes: 0 additions & 9 deletions openjdk/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading