Update temporary build directory for conscrypt.
Bug: 142935992
Test: run-libcore-tests.sh, run-libjdwp-tests.sh
Change-Id: I5401a2b0d033946f83c0cd00dd3969a3aacf24c8
diff --git a/src/vogar/android/AndroidSdk.java b/src/vogar/android/AndroidSdk.java
index 7d53268..995e288 100644
--- a/src/vogar/android/AndroidSdk.java
+++ b/src/vogar/android/AndroidSdk.java
@@ -186,8 +186,13 @@
compilationClasspath = new File[jarNames.length];
for (int i = 0; i < jarNames.length; i++) {
String jar = jarNames[i];
- String apexSuffix = jar.equals("conscrypt") ? jar : "art.testing";
- compilationClasspath[i] = new File(String.format(pattern, jar, apexSuffix));
+ if (modeId.isHost()) {
+ jar = jar.equals("conscrypt-hostdex") ? "conscrypt-host-hostdex" : jar;
+ compilationClasspath[i] = new File(String.format(pattern, jar));
+ } else {
+ String apexSuffix = jar.equals("conscrypt") ? jar : "art.testing";
+ compilationClasspath[i] = new File(String.format(pattern, jar, apexSuffix));
+ }
}
} else {
throw new RuntimeException("Couldn't derive Android home from "
