commit 66ff8a8b82ff103d48d40e8dad01342c2d6f6d0d
author Nicolas Geoffray <ngeoffray@google.com> Wed Feb 28 13:27:55 2018 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Feb 28 13:31:13 2018 +0000
tree f1e177b7276d0387bc109fa12e6bd4cde060d5e9
parent 878124c13b794900b0f5c437f52ac0f61538ab55

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

dex2oat/dex2oat_options.cc

diff --git a/dex2oat/dex2oat_options.cc b/dex2oat/dex2oat_options.cc
index 1ef100d..0d68f4f 100644
--- a/dex2oat/dex2oat_options.cc
+++ b/dex2oat/dex2oat_options.cc
@@ -234,9 +234,10 @@
       .Define("--force-determinism")
           .IntoKey(M::ForceDeterminism)
       .Define("--copy-dex-files=_")
-          .WithType<bool>()
-          .WithValueMap({{"true", false},
-                         {"false", false}})
+          .WithType<CopyOption>()
+          .WithValueMap({{"true", CopyOption::kOnlyIfCompressed},
+                         {"false", CopyOption::kNever},
+                         {"always", CopyOption::kAlways}})
           .IntoKey(M::CopyDexFiles)
       .Define("--classpath-dir=_")
           .WithType<std::string>()