diff options
| author | Bill Buzbee <buzbee@android.com> | 2014-06-19 20:18:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-19 17:43:22 +0000 |
| commit | 4f975b9e2cb7eb50db27093eaa842b7400e52834 (patch) | |
| tree | 08269f0f93868d382ea578ba69e029d0ad8ae943 /dex2oat | |
| parent | 70ac0d09987eb38cc7f55a6b6f8fd92fa67706ce (diff) | |
| parent | 0c416fe40f675a3bff4d8cfb591d66fb69b73958 (diff) | |
| download | art-4f975b9e2cb7eb50db27093eaa842b7400e52834.zip art-4f975b9e2cb7eb50db27093eaa842b7400e52834.tar.gz art-4f975b9e2cb7eb50db27093eaa842b7400e52834.tar.bz2 | |
Merge "x86_64: Enable core.oat/boot.oat compilation"
Diffstat (limited to 'dex2oat')
| -rw-r--r-- | dex2oat/dex2oat.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index d7b34dc..b6b5313 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -1136,8 +1136,7 @@ static int dex2oat(int argc, char** argv) { } if (compiler_filter_string == nullptr) { - if ((instruction_set == kX86_64 && image) || - instruction_set == kArm64 || + if (instruction_set == kArm64 || instruction_set == kMips) { // TODO: implement/fix compilers for these architectures. compiler_filter_string = "interpret-only"; |