summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Narayan Kamath <narayan@google.com> 2014-05-01 10:43:23 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-05-01 10:43:23 +0000
commitb6c04899e1ed614985d638b55dafe2c20e7b673a (patch)
tree66efba07adcb948d6a14af641bb1457b8719913d
parentfd30a0e7b747eb4b781ef8def3008626f14eddfe (diff)
parentc8a045d451522adab5226b0063f3a15d34542bf7 (diff)
am c8a045d4: am 41f40581: Merge "Fix x86 build in app_process."
* commit 'c8a045d451522adab5226b0063f3a15d34542bf7': Fix x86 build in app_process.
-rw-r--r--cmds/app_process/app_main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/app_process/app_main.cpp b/cmds/app_process/app_main.cpp
index 391c1977b6fe..74ccbc2b9220 100644
--- a/cmds/app_process/app_main.cpp
+++ b/cmds/app_process/app_main.cpp
@@ -145,7 +145,7 @@ static void maybeCreateDalvikCache() {
static const char kInstructionSet[] = "x86_64";
#elif defined(__arm__)
static const char kInstructionSet[] = "arm";
-#elif defined(__x86__)
+#elif defined(__i386__)
static const char kInstructionSet[] = "x86";
#elif defined (__mips__)
static const char kInstructionSet[] = "mips";