diff options
| author | Jeff Hao <jeffhao@google.com> | 2014-12-18 20:58:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-18 20:58:17 +0000 |
| commit | 093dad2a47aed9f16fd4190af4b3070b49b982f1 (patch) | |
| tree | 466c935df8ac8ca5087974a1fbf20166daf5b309 /cmds | |
| parent | 22810c4d171a1057bd2f36cb62664a242e7be0b9 (diff) | |
| parent | 51bdc629f59b45fa64331e3c41ac35147ed4c7f6 (diff) | |
| download | frameworks_base-093dad2a47aed9f16fd4190af4b3070b49b982f1.zip frameworks_base-093dad2a47aed9f16fd4190af4b3070b49b982f1.tar.gz frameworks_base-093dad2a47aed9f16fd4190af4b3070b49b982f1.tar.bz2 | |
am e06184e4: Merge "Add mips64 support to app_process."
automerge: 51bdc62
* commit '51bdc629f59b45fa64331e3c41ac35147ed4c7f6':
Add mips64 support to app_process.
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/app_process/app_main.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmds/app_process/app_main.cpp b/cmds/app_process/app_main.cpp index fbdbb25..c86fd53 100644 --- a/cmds/app_process/app_main.cpp +++ b/cmds/app_process/app_main.cpp @@ -146,8 +146,10 @@ static void maybeCreateDalvikCache() { static const char kInstructionSet[] = "arm"; #elif defined(__i386__) static const char kInstructionSet[] = "x86"; -#elif defined (__mips__) +#elif defined (__mips__) && !defined(__LP64__) static const char kInstructionSet[] = "mips"; +#elif defined (__mips__) && defined(__LP64__) + static const char kInstructionSet[] = "mips64"; #else #error "Unknown instruction set" #endif |