diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-31 03:43:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-31 03:43:53 +0000 |
| commit | a053c841df11c4b8b2e89724a55bc4fd428ca013 (patch) | |
| tree | 2971b8550a5c19be565dffc238836fe7e6b2b138 /cmds | |
| parent | 0fd44a7b3dc6d2bc0a5f96d0b07c619e55358e6b (diff) | |
| parent | 059e9c023eb025472db6775f9c2a95191dd6c2bf (diff) | |
| download | frameworks_native-a053c841df11c4b8b2e89724a55bc4fd428ca013.zip frameworks_native-a053c841df11c4b8b2e89724a55bc4fd428ca013.tar.gz frameworks_native-a053c841df11c4b8b2e89724a55bc4fd428ca013.tar.bz2 | |
am 059e9c02: am 8c60cec0: am 5881c8dd: Merge "Installd: Support dex2oat threads system property"
* commit '059e9c023eb025472db6775f9c2a95191dd6c2bf':
Installd: Support dex2oat threads system property
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/installd/commands.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c index 9fc3f40..a68d94d 100644 --- a/cmds/installd/commands.c +++ b/cmds/installd/commands.c @@ -722,6 +722,14 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name, bool have_dex2oat_compiler_filter_flag = property_get("dalvik.vm.dex2oat-filter", dex2oat_compiler_filter_flag, NULL) > 0; + char dex2oat_threads_buf[PROPERTY_VALUE_MAX]; + bool have_dex2oat_threads_flag = property_get("dalvik.vm.dex2oat-threads", dex2oat_threads_buf, + NULL) > 0; + char dex2oat_threads_arg[PROPERTY_VALUE_MAX + 2]; + if (have_dex2oat_threads_flag) { + sprintf(dex2oat_threads_arg, "-j%s", dex2oat_threads_buf); + } + char dex2oat_isa_features_key[PROPERTY_KEY_MAX]; sprintf(dex2oat_isa_features_key, "dalvik.vm.isa.%s.features", instruction_set); char dex2oat_isa_features[PROPERTY_VALUE_MAX]; @@ -841,6 +849,7 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name, + (have_dex2oat_Xms_flag ? 2 : 0) + (have_dex2oat_Xmx_flag ? 2 : 0) + (have_dex2oat_compiler_filter_flag ? 1 : 0) + + (have_dex2oat_threads_flag ? 1 : 0) + (have_dex2oat_swap_fd ? 1 : 0) + (have_dex2oat_relocation_skip_flag ? 2 : 0) + (debuggable ? 1 : 0) @@ -875,6 +884,9 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name, if (have_dex2oat_compiler_filter_flag) { argv[i++] = dex2oat_compiler_filter_arg; } + if (have_dex2oat_threads_flag) { + argv[i++] = dex2oat_threads_arg; + } if (have_dex2oat_swap_fd) { argv[i++] = dex2oat_swap_fd; } |