Add the File[] class to the primary boot image.
Test: m
Bug: 150319075
Bug: 148067697
Change-Id: I5590693f97c7f51a2fa013a828989ec65ceae902
diff --git a/dex2oat/driver/compiler_driver.cc b/dex2oat/driver/compiler_driver.cc
index 344f800..15c7c65 100644
--- a/dex2oat/driver/compiler_driver.cc
+++ b/dex2oat/driver/compiler_driver.cc
@@ -1076,6 +1076,12 @@
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();