am f94b250f: am 0a50264b: Merge "ART: Allow oat files with duplicates classes in corner case"

* commit 'f94b250f426c7f43f9ee78e39e07d6ee13842b20':
  ART: Allow oat files with duplicates classes in corner case

1 files changed, 4 insertions, 0 deletions

diff --git a/runtime/dex_file.h b/runtime/dex_file.h
index 6b3f883a5d..84eaa4a73e 100644
--- a/runtime/dex_file.h
+++ b/runtime/dex_file.h
@@ -388,6 +388,10 @@ class DexFile {
   static bool Open(const char* filename, const char* location, std::string* error_msg,
                    std::vector<std::unique_ptr<const DexFile>>* dex_files);
 
+  // Checks whether the given file has the dex magic, or is a zip file with a classes.dex entry.
+  // If this function returns false, Open will not succeed. The inverse is not true, however.
+  static bool MaybeDex(const char* filename);
+
   // Opens .dex file, backed by existing memory
   static std::unique_ptr<const DexFile> Open(const uint8_t* base, size_t size,
                                              const std::string& location,