| commit | 6006e2ce92fd86fdf028cd7b3afe972815b0e0f3 | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Thu Feb 04 00:22:21 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Feb 04 00:22:21 2016 +0000 |
| tree | cb315d9cd38584e800a2bea4be47b01791af1278 | |
| parent | 009a195c5507ddc799cf7a52927b0ac02aa7f7e6 [diff] | |
| parent | 97590ccb357eb7429063e15597e75f2692108789 [diff] |
Merge "Strip image-format arg in dex2oat"
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index b3e3ba6..d30f697 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc
@@ -126,6 +126,11 @@ continue; } + // The image format is dropped. + if (StartsWith(original_argv[i], "--image-format=")) { + continue; + } + // This should leave any dex-file and oat-file options, describing what we compiled. // However, we prefer to drop this when we saw --zip-fd.