drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 41f40581: Merge "Fix x86 build in app_process."

Browse Source 
* commit '41f40581ee0284660d30be8ef28f6bf721c4ce10':
  Fix x86 build in app_process.
This commit is contained in:
Narayan Kamath
2014-05-01 10:39:55 +00:00
committed by Android Git Automerger
parent ff34f6faaa 41f40581ee
commit c8a045d451
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/app_process/app_main.cpp
View File

@ -145,7 +145,7 @@ static void maybeCreateDalvikCache() {
static const char kInstructionSet[] = "x86_64"; static const char kInstructionSet[] = "x86_64";
#elif defined(__arm__) #elif defined(__arm__)
static const char kInstructionSet[] = "arm"; static const char kInstructionSet[] = "arm";
#elif defined(__x86__) #elif defined(__i386__)
static const char kInstructionSet[] = "x86"; static const char kInstructionSet[] = "x86";
#elif defined (__mips__) #elif defined (__mips__)
static const char kInstructionSet[] = "mips"; static const char kInstructionSet[] = "mips";