Add jdk-11-tests as dependency in new gradle setup
Bug: b/270105162
Change-Id: I9e838460d0a1fa5b99ba081730a21db5884e387c
diff --git a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
index 8af5714..97647e9 100644
--- a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
+++ b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
@@ -338,6 +338,11 @@
Paths.get("third_party", "openjdk", "openjdk-rt-1.8.tar.gz.sha1").toFile()
)
val jdks = getJdks()
+ val jdk11Test = ThirdPartyDependency(
+ "jdk-11-test",
+ Paths.get("third_party", "openjdk", "jdk-11-test", "Makefile").toFile(),
+ Paths.get("third_party", "openjdk", "jdk-11-test.tar.gz.sha1").toFile()
+ )
val jdwpTests = ThirdPartyDependency(
"jdwp-tests",
Paths.get("third_party", "jdwp-tests", "apache-harmony-jdwp-tests-host.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 f7e52e5..3008c9c 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,11 @@
val thirdPartyRuntimeDependenciesTask = ensureThirdPartyDependencies(
"runtimeDeps",
- listOf(ThirdPartyDeps.compilerApi, ThirdPartyDeps.jacoco, ThirdPartyDeps.java8Runtime)
+ listOf(
+ ThirdPartyDeps.compilerApi,
+ ThirdPartyDeps.jacoco,
+ ThirdPartyDeps.java8Runtime,
+ ThirdPartyDeps.jdk11Test)
+ ThirdPartyDeps.androidJars
+ ThirdPartyDeps.androidVMs
+ ThirdPartyDeps.jdks
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11TestLibraryDesugaringSpecification.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11TestLibraryDesugaringSpecification.java
index f909be9..6eabf06 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11TestLibraryDesugaringSpecification.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11TestLibraryDesugaringSpecification.java
@@ -33,9 +33,10 @@
private static final String EXTENSION_STRING = "build/libs/java_base_extension.jar";
private static final Path JDK_11_JAVA_BASE_EXTENSION_FILES_DIR =
- Paths.get("third_party/openjdk/jdk-11-test/lib/testlibrary/bootlib/java.base");
+ Paths.get(
+ ToolHelper.THIRD_PARTY_DIR, "openjdk/jdk-11-test/lib/testlibrary/bootlib/java.base");
private static final Path JDK_11_TESTLIBRARY_FILES_DIR =
- Paths.get("third_party/openjdk/jdk-11-test/lib/testlibrary/jdk");
+ Paths.get(ToolHelper.THIRD_PARTY_DIR, "openjdk/jdk-11-test/lib/testlibrary/jdk");
public static Path EXTENSION_PATH;
