Enable android-test by default (#7899)

android-test/build.gradle.kts

@@ -1,15 +1,19 @@
+@file:Suppress("UnstableApiUsage")
+
 plugins {
   id("com.android.library")
   kotlin("android")
   id("de.mannodermaus.android-junit5")
 }
 
+val androidBuild = property("androidBuild").toString().toBoolean()
+
 android {
-  compileSdk = 31
+  compileSdk = 33
 
   defaultConfig {
     minSdk = 21
-    targetSdk = 31
+    targetSdk = 33
 
     // Make sure to use the AndroidJUnitRunner (or a sub-class) in order to hook in the JUnit 5 Test Builder
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -19,12 +23,14 @@ android {
     )
   }
 
-  sourceSets["androidTest"].java.srcDirs(
+  if (androidBuild) {
-    "../okhttp-brotli/src/test/java",
+    sourceSets["androidTest"].java.srcDirs(
-    "../okhttp-dnsoverhttps/src/test/java",
+      "../okhttp-brotli/src/test/java",
-    "../okhttp-logging-interceptor/src/test/java",
+      "../okhttp-dnsoverhttps/src/test/java",
-    "../okhttp-sse/src/test/java"
+      "../okhttp-logging-interceptor/src/test/java",
-  )
+      "../okhttp-sse/src/test/java"
+    )
+  }
 
   compileOptions {
     targetCompatibility(JavaVersion.VERSION_11)

settings.gradle.kts

@@ -14,7 +14,6 @@ val graalBuild: String by settings
 val loomBuild: String by settings
 
 if (androidBuild.toBoolean()) {
-  include(":android-test")
   include(":regression-test")
 }
 
@@ -45,5 +44,6 @@ include(":samples:slack")
 include(":samples:static-server")
 include(":samples:tlssurvey")
 include(":samples:unixdomainsockets")
+include(":android-test")
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")