diff options
| author | Narayan Kamath <narayan@google.com> | 2014-04-11 09:57:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-11 09:57:27 +0000 |
| commit | c3255ae04c8bec36f6701b92bf645323558e23c1 (patch) | |
| tree | 30ef01bb6382cb45710565a05e411a4f6a6c6c7f /cmds | |
| parent | 55dab4dd3b5b56ade91c012d688b581b6cbdebdf (diff) | |
| parent | de442781cd4f7404e8aaa3f7ca5d1d3fc28cccc6 (diff) | |
| download | frameworks_base-c3255ae04c8bec36f6701b92bf645323558e23c1.zip frameworks_base-c3255ae04c8bec36f6701b92bf645323558e23c1.tar.gz frameworks_base-c3255ae04c8bec36f6701b92bf645323558e23c1.tar.bz2 | |
am de442781: am 909a6a0e: Merge "Dual zygote cleanup."
* commit 'de442781cd4f7404e8aaa3f7ca5d1d3fc28cccc6':
Dual zygote cleanup.
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/app_process/app_main.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cmds/app_process/app_main.cpp b/cmds/app_process/app_main.cpp index 3e8d6a0..c520b58 100644 --- a/cmds/app_process/app_main.cpp +++ b/cmds/app_process/app_main.cpp @@ -138,8 +138,10 @@ static size_t computeArgBlockSize(int argc, char* const argv[]) { #if defined(__LP64__) static const char ABI_LIST_PROPERTY[] = "ro.product.cpu.abilist64"; +static const char ZYGOTE_NICE_NAME[] = "zygote64"; #else static const char ABI_LIST_PROPERTY[] = "ro.product.cpu.abilist32"; +static const char ZYGOTE_NICE_NAME[] = "zygote"; #endif int main(int argc, char* const argv[]) @@ -185,16 +187,19 @@ int main(int argc, char* const argv[]) const char* arg = argv[i++]; if (strcmp(arg, "--zygote") == 0) { zygote = true; - niceName = "zygote"; + niceName = ZYGOTE_NICE_NAME; } else if (strcmp(arg, "--start-system-server") == 0) { startSystemServer = true; } else if (strcmp(arg, "--application") == 0) { application = true; } else if (strncmp(arg, "--nice-name=", 12) == 0) { niceName = arg + 12; - } else { + } else if (strncmp(arg, "--", 2) != 0) { className.setTo(arg); break; + } else { + --i; + break; } } |