Add aapt2 as a test runtime dependency
Bug: b/287398085
Change-Id: I047e666563e649760ff628f33a3feb4d0c83cba0
diff --git a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
index b8569b1..e11a8d9 100644
--- a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
+++ b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
@@ -314,6 +314,10 @@
}
object ThirdPartyDeps {
+ val aapt2 = ThirdPartyDependency(
+ "aapt2",
+ Paths.get("third_party", "aapt2").toFile(),
+ Paths.get("third_party", "aapt2.tar.gz.sha1").toFile())
val androidJars = getThirdPartyAndroidJars()
val androidVMs = getThirdPartyAndroidVms()
val apiDatabase = ThirdPartyDependency(
@@ -593,4 +597,4 @@
Paths.get("third_party", "gmscore", it).toFile(),
Paths.get("third_party", "gmscore", "${it}.tar.gz.sha1").toFile(),
DependencyType.X20)}
-}
\ No newline at end of file
+}
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 eb0b582..e8284c4 100644
--- a/d8_r8/test_modules/tests_java_8/build.gradle.kts
+++ b/d8_r8/test_modules/tests_java_8/build.gradle.kts
@@ -56,6 +56,7 @@
val thirdPartyRuntimeDependenciesTask = ensureThirdPartyDependencies(
"runtimeDeps",
listOf(
+ ThirdPartyDeps.aapt2,
ThirdPartyDeps.artTests,
ThirdPartyDeps.artTestsLegacy,
ThirdPartyDeps.compilerApi,
