Fix host build to properly build x86.
Change-Id: Ib8acb75cca2f0728297180e082a89f4f81784e75
diff --git a/src/dex2oat.cc b/src/dex2oat.cc
index 0d3fa58..85c11a0 100644
--- a/src/dex2oat.cc
+++ b/src/dex2oat.cc
@@ -106,10 +106,10 @@
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 @@
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") {