am e06184e4: Merge "Add mips64 support to app_process."

automerge: 51bdc62

* commit '51bdc629f59b45fa64331e3c41ac35147ed4c7f6':
  Add mips64 support to app_process.
This commit is contained in:
Jeff Hao
2014-12-18 20:58:17 +00:00
committed by android-build-merger

View File

@ -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