Merge "Update to build tools 34.0.0-rc3" into androidx-main
diff --git a/buildSrc/public/src/main/kotlin/androidx/build/SupportConfig.kt b/buildSrc/public/src/main/kotlin/androidx/build/SupportConfig.kt
index f3b7ee8..9842cf0 100644
--- a/buildSrc/public/src/main/kotlin/androidx/build/SupportConfig.kt
+++ b/buildSrc/public/src/main/kotlin/androidx/build/SupportConfig.kt
@@ -24,7 +24,7 @@
object SupportConfig {
const val DEFAULT_MIN_SDK_VERSION = 14
const val INSTRUMENTATION_RUNNER = "androidx.test.runner.AndroidJUnitRunner"
- const val BUILD_TOOLS_VERSION = "33.0.1"
+ const val BUILD_TOOLS_VERSION = "34.0.0-rc3"
const val NDK_VERSION = "23.1.7779620"
/**
diff --git a/inspection/inspection-gradle-plugin/src/main/kotlin/androidx/inspection/gradle/DexInspectorTask.kt b/inspection/inspection-gradle-plugin/src/main/kotlin/androidx/inspection/gradle/DexInspectorTask.kt
index 6f7bb9b..7d95e6b 100644
--- a/inspection/inspection-gradle-plugin/src/main/kotlin/androidx/inspection/gradle/DexInspectorTask.kt
+++ b/inspection/inspection-gradle-plugin/src/main/kotlin/androidx/inspection/gradle/DexInspectorTask.kt
@@ -75,8 +75,11 @@
val output = outputFile.get().asFile
output.parentFile.mkdirs()
val errorStream = ByteArrayOutputStream()
- val executionResult = execOperations.exec {
- it.executable = d8Executable.get().asFile.absolutePath
+ val executionResult = execOperations.javaexec {
+ it.classpath(File(File(d8Executable.get().asFile.parentFile, "lib"), "d8.jar"))
+ it.mainClass.set("com.android.tools.r8.D8")
+ it.allJvmArgs.add("-Xmx2G")
+
val filesToDex = jars.map { file -> file.absolutePath }
// All runtime dependencies of the inspector are already jarjar-ed and packed in
