summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dex2oat/driver/compiler_driver.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/dex2oat/driver/compiler_driver.cc b/dex2oat/driver/compiler_driver.cc
index 344f8009e1..15c7c65337 100644
--- a/dex2oat/driver/compiler_driver.cc
+++ b/dex2oat/driver/compiler_driver.cc
@@ -1076,6 +1076,12 @@ void CompilerDriver::LoadImageClasses(TimingLogger* timings,
return;
}
+ // Make sure the File[] class is in the primary boot image. b/150319075
+ // TODO: Implement support for array classes in profiles and remove this workaround. b/148067697
+ if (GetCompilerOptions().IsBootImage()) {
+ image_classes->insert("[Ljava/io/File;");
+ }
+
TimingLogger::ScopedTiming t("LoadImageClasses", timings);
// Make a first pass to load all classes explicitly listed in the file
Thread* self = Thread::Current();