| commit | 531e86c88872f7d28fb751a57efccdeed7ec960a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Jun 10 16:34:24 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Jun 10 16:34:25 2016 +0000 |
| tree | 5878bb082905af886124bf2c6945ff2083f8b203 | |
| parent | ca7399a1d7b3c92d73322adf54187fde31eee1bd [diff] | |
| parent | 1fdbe1b034d97b852551d24e70245df64f03ebeb [diff] |
Merge "ART: Add ATRACE section for collision check"
diff --git a/runtime/oat_file_manager.cc b/runtime/oat_file_manager.cc index d7d2b5c..3eeccd2 100644 --- a/runtime/oat_file_manager.cc +++ b/runtime/oat_file_manager.cc
@@ -515,6 +515,8 @@ return false; } + ScopedTrace st("Collision check"); + // Add dex files from the oat file to check. AddDexFilesFromOat(oat_file, /*already_loaded*/false, &queue);