Don't embed the dex code in the oat file if dex is uncompressed.

Take uncompressed dex code as a signal that the app wants to
opt into b/63920015.

bug: 63920015
Test: dex2oat_test, 071-dexfile-clean-map

Change-Id: I878e7bb80fc895a2d9aafe81aa7666b86af1f808

1 files changed, 9 insertions, 0 deletions

diff --git a/runtime/oat_file.h b/runtime/oat_file.h
index 36a4d7b8fc..61daa9579e 100644
--- a/runtime/oat_file.h
+++ b/runtime/oat_file.h
@@ -324,6 +324,11 @@ class OatFile {
     return vdex_.get();
   }
 
+  // Whether the OatFile embeds the Dex code.
+  bool ContainsDexCode() const {
+    return uncompressed_dex_files_ == nullptr;
+  }
+
  protected:
   OatFile(const std::string& filename, bool executable);
 
@@ -389,6 +394,10 @@ class OatFile {
   // elements. std::list<> and std::deque<> satisfy this requirement, std::vector<> doesn't.
   mutable std::list<std::string> string_cache_ GUARDED_BY(secondary_lookup_lock_);
 
+  // Cache of dex files mapped directly from a location, in case the OatFile does
+  // not embed the dex code.
+  std::unique_ptr<std::vector<std::unique_ptr<const DexFile>>> uncompressed_dex_files_;
+
   friend class gc::collector::DummyOatFile;  // For modifying begin_ and end_.
   friend class OatClass;
   friend class art::OatDexFile;