summaryrefslogtreecommitdiffstats
path: root/cmds/app_process
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-04-30 16:45:07 +0100
committerNarayan Kamath <narayan@google.com>2014-05-01 11:27:49 +0100
commitd6183204e438a738b68301aeac452c0be41c8cb3 (patch)
tree76da5e53d9141f3689a49bb91a360d005b4183ff /cmds/app_process
parent973cdeed8eb9aa250b1b3bd5549df0e0dc78457e (diff)
downloadframeworks_base-d6183204e438a738b68301aeac452c0be41c8cb3.zip
frameworks_base-d6183204e438a738b68301aeac452c0be41c8cb3.tar.gz
frameworks_base-d6183204e438a738b68301aeac452c0be41c8cb3.tar.bz2
Fix x86 build in app_process.
Look for __i386__ and not __x86__. (cherry picked from commit 47d526217b3fd0d17ba751c66d25cfaf1c6ed7cd) Change-Id: I848ba351c378e59ab6744ca1983ae4463ae75ba4
Diffstat (limited to 'cmds/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 391c197..74ccbc2 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";