Don't infer the default boot image location in otapreopt.
otapreopt calls derive_classpath but only takes BOOTCLASSPATH from the
output, not DEX2OATBOOTCLASSPATH or other env variables. The runtime
cannot handle this case when inferring the default boot image location
once aosp/2470962 is merged.
We don't have a boot image for otapreopt anyway, so just don't attempt
to infer the default boot image location.
Bug: 272573887
Test: ABTD (http://go/abtd-run/L42700000959054591): See no dex2oat
crashes in the logs, though the test is failing due to another known
issue (b/270940551)
Change-Id: I63c406b7f4c55247fec858d7b97234e7348a67da
diff --git a/cmds/installd/otapreopt.cpp b/cmds/installd/otapreopt.cpp
index bf2c0d1..7cabdb0 100644
--- a/cmds/installd/otapreopt.cpp
+++ b/cmds/installd/otapreopt.cpp
@@ -711,6 +711,11 @@
return true;
}
+bool force_compile_without_image() {
+ // We don't have a boot image anyway. Compile without a boot image.
+ return true;
+}
+
static int log_callback(int type, const char *fmt, ...) {
va_list ap;
int priority;