commit baeaa9b4517cfb8876369ff33c2bb92ff9c79ef1
author Nicolas Geoffray <ngeoffray@google.com> Fri Jan 26 14:31:17 2018 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Thu Feb 01 11:54:00 2018 +0000
tree 4c056b6847e958b58d8532159f5c15f9fbc0287a
parent b3c0c8086f85d415a3425bc17373e4c792d64b47

dex2oat: Accept .dm files.

And locate primary.vdex in it to do fast verification.

bug: 63920015
Test: 674-HelloWorld-Dm
Change-Id: If920a6c7e4856a047a24bd30b049ef1ee16d7c1f

dex2oat/dex2oat_options.cc

diff --git a/dex2oat/dex2oat_options.cc b/dex2oat/dex2oat_options.cc
index a2e2b48..0eecc84 100644
--- a/dex2oat/dex2oat_options.cc
+++ b/dex2oat/dex2oat_options.cc
@@ -86,6 +86,12 @@
       .Define("--output-vdex=_")
           .WithType<std::string>()
           .IntoKey(M::OutputVdex)
+      .Define("--dm-fd=_")
+          .WithType<int>()
+          .IntoKey(M::DmFd)
+      .Define("--dm-file=_")
+          .WithType<std::string>()
+          .IntoKey(M::DmFile)
       .Define("--oat-file=_")
           .WithType<std::vector<std::string>>().AppendValues()
           .IntoKey(M::OatFiles)