diff options
Diffstat (limited to 'dex2oat/dex2oat.cc')
| -rw-r--r-- | dex2oat/dex2oat.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index 908d995451..72effded06 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -837,6 +837,8 @@ static int dex2oat(int argc, char** argv) { StringPiece instruction_set_str = option.substr(strlen("--instruction-set=")).data(); if (instruction_set_str == "arm") { instruction_set = kThumb2; + } else if (instruction_set_str == "arm64") { + instruction_set = kArm64; } else if (instruction_set_str == "mips") { instruction_set = kMips; } else if (instruction_set_str == "x86") { @@ -1020,8 +1022,8 @@ static int dex2oat(int argc, char** argv) { } if (compiler_filter_string == NULL) { - if (instruction_set == kX86_64) { - // TODO: currently x86-64 is only interpreted. + if (instruction_set == kX86_64 || instruction_set == kArm64) { + // TODO: currently x86-64 and arm64 are only interpreted. compiler_filter_string = "interpret-only"; } else if (image) { compiler_filter_string = "speed"; |