summaryrefslogtreecommitdiff
path: root/runtime/runtime.cc
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2018-02-28 13:27:55 +0000
committer Nicolas Geoffray <ngeoffray@google.com> 2018-02-28 13:31:13 +0000
commit66ff8a8b82ff103d48d40e8dad01342c2d6f6d0d (patch)
treef1e177b7276d0387bc109fa12e6bd4cde060d5e9 /runtime/runtime.cc
parent878124c13b794900b0f5c437f52ac0f61538ab55 (diff)
Revert "Revert "Full-stack integrity: check vdex contents.""
bug: 30972906 Initial revert due to 'check' file of the test needing updating for target tests. This reverts commit a19b7649faf8780737be7ce3ec48a12d81c6d69f. Change-Id: I455780bd88cd89ff80c9084d399e2beeb819b95f
Diffstat (limited to 'runtime/runtime.cc')
-rw-r--r--runtime/runtime.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 2074f1e5f5..4442fc6a54 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1593,6 +1593,11 @@ bool Runtime::Init(RuntimeArgumentMap&& runtime_options_in) {
VLOG(startup) << "Runtime::Init exiting";
+ // Set OnlyUseSystemOatFiles only after boot classpath has been set up.
+ if (runtime_options.Exists(Opt::OnlyUseSystemOatFiles)) {
+ oat_file_manager_->SetOnlyUseSystemOatFiles();
+ }
+
return true;
}