diff options
| author | 2012-05-24 16:22:08 -0700 | |
|---|---|---|
| committer | 2012-05-24 16:22:08 -0700 | |
| commit | 221a9f3c0eb6ba8e4b58974eb2ac4e3e81580593 (patch) | |
| tree | c49d6fbf57fb04f24452280cc7444b1aeb95d1e0 /src | |
| parent | 21ba27fc8d31b831a19b90bf570550b46ac9e8cd (diff) | |
| parent | 1f71ae819e506c40ad5adccec4b2e57699e0b5c4 (diff) | |
Merge "Fix host build to properly build x86." into ics-mr1-plus-art
Diffstat (limited to 'src')
| -rw-r--r-- | src/dex2oat.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/dex2oat.cc b/src/dex2oat.cc index 0d3fa5879f..85c11a099e 100644 --- a/src/dex2oat.cc +++ b/src/dex2oat.cc @@ -106,10 +106,10 @@ static void Usage(const char* fmt, ...) { UsageError(" Example: --host-prefix=out/target/product/crespo"); UsageError(" Default: $ANDROID_PRODUCT_OUT"); UsageError(""); - UsageError(" --instruction-set=(ARM|Thumb2|MIPS|X86): compile for a particular instruction"); + UsageError(" --instruction-set=(arm|mips|x86): compile for a particular instruction"); UsageError(" set."); - UsageError(" Example: --instruction-set=X86"); - UsageError(" Default: Thumb2"); + UsageError(" Example: --instruction-set=x86"); + UsageError(" Default: arm"); UsageError(""); UsageError(" --runtime-arg <argument>: used to specify various arguments for the runtime,"); UsageError(" such as initial heap size, maximum heap size, and verbose output."); @@ -535,11 +535,11 @@ static int dex2oat(int argc, char** argv) { host_prefix.reset(new std::string(option.substr(strlen("--host-prefix=")).data())); } else if (option.starts_with("--instruction-set=")) { StringPiece instruction_set_str = option.substr(strlen("--instruction-set=")).data(); - if (instruction_set_str == "Thumb2" || instruction_set_str == "ARM") { + if (instruction_set_str == "arm") { instruction_set = kThumb2; - } else if (instruction_set_str == "MIPS") { + } else if (instruction_set_str == "mips") { instruction_set = kMips; - } else if (instruction_set_str == "X86") { + } else if (instruction_set_str == "x86") { instruction_set = kX86; } } else if (option == "--runtime-arg") { |