Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 909a6a0e: Merge "Dual zygote cleanup."

Browse Source 
* commit '909a6a0e2b5815332618b2cf731d27824a76d042':
  Dual zygote cleanup.
This commit is contained in:
Narayan Kamath
2014-04-11 08:45:47 +00:00
committed by Android Git Automerger
parent 940e76fd37 909a6a0e2b
commit de442781cd
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmds/app_process/app_main.cpp
View File

@@ -138,8 +138,10 @@ static size_t computeArgBlockSize(int argc, char* const argv[]) {
#if defined(__LP64__) #if defined(__LP64__)
static const char ABI_LIST_PROPERTY[] = "ro.product.cpu.abilist64"; static const char ABI_LIST_PROPERTY[] = "ro.product.cpu.abilist64";
static const char ZYGOTE_NICE_NAME[] = "zygote64";
#else #else
static const char ABI_LIST_PROPERTY[] = "ro.product.cpu.abilist32"; static const char ABI_LIST_PROPERTY[] = "ro.product.cpu.abilist32";
static const char ZYGOTE_NICE_NAME[] = "zygote";
#endif #endif
int main(int argc, char* const argv[]) int main(int argc, char* const argv[])
@@ -185,16 +187,19 @@ int main(int argc, char* const argv[])
const char* arg = argv[i++]; const char* arg = argv[i++];
if (strcmp(arg, "--zygote") == 0) { if (strcmp(arg, "--zygote") == 0) {
zygote = true; zygote = true;
niceName = "zygote"; niceName = ZYGOTE_NICE_NAME;
} else if (strcmp(arg, "--start-system-server") == 0) { } else if (strcmp(arg, "--start-system-server") == 0) {
startSystemServer = true; startSystemServer = true;
} else if (strcmp(arg, "--application") == 0) { } else if (strcmp(arg, "--application") == 0) {
application = true; application = true;
} else if (strncmp(arg, "--nice-name=", 12) == 0) { } else if (strncmp(arg, "--nice-name=", 12) == 0) {
niceName = arg + 12; niceName = arg + 12;
} else { } else if (strncmp(arg, "--", 2) != 0) {
className.setTo(arg); className.setTo(arg);
break; break;
} else {
--i;
break;
} }
} }