Ensure we can run compiler api tests in the new gradle setup
Bug: b/270105162
Change-Id: I63cad73ef4316ab3b0cbb5c94c3cb424284bcff3
diff --git a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
index 6824b3e..4dae58c 100644
--- a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
+++ b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
@@ -297,7 +297,7 @@
}
object ThirdPartyDeps {
- val androidJars : List<ThirdPartyDependency> = getThirdPartyAndroidJars()
+ val androidJars = getThirdPartyAndroidJars()
val androidVMs = getThirdPartyAndroidVms()
val apiDatabase = ThirdPartyDependency(
"apiDatabase",
@@ -308,6 +308,17 @@
"resources",
"new_api_database.ser").toFile(),
Paths.get("third_party", "api_database", "api_database.tar.gz.sha1").toFile())
+ val compilerApi = ThirdPartyDependency(
+ "compiler-api",
+ Paths.get(
+ "third_party",
+ "binary_compatibility_tests",
+ "compiler_api_tests",
+ "tests.jar").toFile(),
+ Paths.get(
+ "third_party",
+ "binary_compatibility_tests",
+ "compiler_api_tests.tar.gz.sha1").toFile())
val ddmLib = ThirdPartyDependency(
"ddmlib",
Paths.get("third_party", "ddmlib", "ddmlib.jar").toFile(),
diff --git a/d8_r8/test_modules/tests_java_8/build.gradle.kts b/d8_r8/test_modules/tests_java_8/build.gradle.kts
index 7e41431..81c3708 100644
--- a/d8_r8/test_modules/tests_java_8/build.gradle.kts
+++ b/d8_r8/test_modules/tests_java_8/build.gradle.kts
@@ -55,7 +55,7 @@
val thirdPartyRuntimeDependenciesTask = ensureThirdPartyDependencies(
"runtimeDeps",
- listOf(ThirdPartyDeps.jacoco, ThirdPartyDeps.java8Runtime)
+ listOf(ThirdPartyDeps.compilerApi, ThirdPartyDeps.jacoco, ThirdPartyDeps.java8Runtime)
+ ThirdPartyDeps.androidJars
+ ThirdPartyDeps.androidVMs
+ ThirdPartyDeps.jdks
