diff options
| author | Narayan Kamath <narayan@google.com> | 2014-05-01 10:36:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-01 10:36:31 +0000 |
| commit | 41f40581ee0284660d30be8ef28f6bf721c4ce10 (patch) | |
| tree | 76da5e53d9141f3689a49bb91a360d005b4183ff /cmds | |
| parent | 27b03e6272479ed82762a4a5d6e4be4f26c1ed58 (diff) | |
| parent | d6183204e438a738b68301aeac452c0be41c8cb3 (diff) | |
| download | frameworks_base-41f40581ee0284660d30be8ef28f6bf721c4ce10.zip frameworks_base-41f40581ee0284660d30be8ef28f6bf721c4ce10.tar.gz frameworks_base-41f40581ee0284660d30be8ef28f6bf721c4ce10.tar.bz2 | |
Merge "Fix x86 build in app_process."
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/app_process/app_main.cpp | 2 |
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"; |