Allow stripped APK to be compiled with a vdex.
bug: 37558732
Test: oat_file_assistant_test
Test: "adb shell cmd package compile" of a stripped /system apk
Change-Id: I48d4baf13fa356ab84e7dd04f318a595e13fd70b
diff --git a/runtime/oat_file_assistant.cc b/runtime/oat_file_assistant.cc
index a7be73a..322bd1c 100644
--- a/runtime/oat_file_assistant.cc
+++ b/runtime/oat_file_assistant.cc
@@ -848,24 +848,24 @@
return kNoDexOptNeeded;
}
- if (oat_file_assistant_->HasOriginalDexFiles()) {
- if (filter_okay && Status() == kOatRelocationOutOfDate) {
- return kDex2OatForRelocation;
- }
-
- if (IsUseable()) {
- return kDex2OatForFilter;
- }
-
- if (Status() == kOatBootImageOutOfDate) {
- return kDex2OatForBootImage;
- }
-
- return kDex2OatFromScratch;
+ if (filter_okay && Status() == kOatRelocationOutOfDate) {
+ return kDex2OatForRelocation;
}
- // Otherwise there is nothing we can do, even if we want to.
- return kNoDexOptNeeded;
+ if (IsUseable()) {
+ return kDex2OatForFilter;
+ }
+
+ if (Status() == kOatBootImageOutOfDate) {
+ return kDex2OatForBootImage;
+ }
+
+ if (oat_file_assistant_->HasOriginalDexFiles()) {
+ return kDex2OatFromScratch;
+ } else {
+ // Otherwise there is nothing we can do, even if we want to.
+ return kNoDexOptNeeded;
+ }
}
const OatFile* OatFileAssistant::OatFileInfo::GetFile() {