diff options
| author | Narayan Kamath <narayan@google.com> | 2014-04-30 15:59:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-30 15:59:08 +0000 |
| commit | f53418931b40784964bf56104b409fe9b3934b3b (patch) | |
| tree | 1867438dfdc868744ddc17c7f4edcb1d0c0dfaeb | |
| parent | e2b2514342448b97d7658dd4920b339a5239274c (diff) | |
| parent | 6eb1b2611cd2db7f2c2063f8be219d4ef19d11d0 (diff) | |
| download | frameworks_base-f53418931b40784964bf56104b409fe9b3934b3b.zip frameworks_base-f53418931b40784964bf56104b409fe9b3934b3b.tar.gz frameworks_base-f53418931b40784964bf56104b409fe9b3934b3b.tar.bz2 | |
Merge "Fix x86 build in app_process."
| -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"; |