diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-07-30 14:37:11 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-08-06 21:59:35 -0700 |
| commit | 41cd9eb42471e99831fbbbb72b841202bbf33648 (patch) | |
| tree | 34cb7634f8c72fabd410b5d54672943558c8dea0 /cmds | |
| parent | 9a87db6e1f48fb58398ac186968b08d000342098 (diff) | |
| download | frameworks_native-41cd9eb42471e99831fbbbb72b841202bbf33648.zip frameworks_native-41cd9eb42471e99831fbbbb72b841202bbf33648.tar.gz frameworks_native-41cd9eb42471e99831fbbbb72b841202bbf33648.tar.bz2 | |
Disable compilation based on vold.decrypt. [frameworks/native]
Bug: 15165413
(cherry picked from commit 538998f204d1e542e235de9e7ce18ef4dc68c9cc)
Change-Id: Idae36efa1cb3fb99b51fa0a79b6bb037981d1c71
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/installd/commands.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c index 4faac81..bd721c8 100644 --- a/cmds/installd/commands.c +++ b/cmds/installd/commands.c @@ -692,6 +692,13 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name, bool have_dex2oat_flags = property_get("dalvik.vm.dex2oat-flags", dex2oat_flags, NULL) > 0; ALOGV("dalvik.vm.dex2oat-flags=%s\n", dex2oat_flags); + // If we booting without the real /data, don't spend time compiling. + char vold_decrypt[PROPERTY_VALUE_MAX]; + bool have_vold_decrypt = property_get("vold.decrypt", vold_decrypt, "") > 0; + bool skip_compilation = (have_vold_decrypt && + (strcmp(vold_decrypt, "trigger_restart_min_framework") == 0 || + (strcmp(vold_decrypt, "1") == 0))); + static const char* DEX2OAT_BIN = "/system/bin/dex2oat"; static const char* RUNTIME_ARG = "--runtime-arg"; @@ -746,7 +753,10 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name, if (have_dex2oat_Xmx_flag) { sprintf(dex2oat_Xmx_arg, "-Xmx%s", dex2oat_Xmx_flag); } - if (have_dex2oat_compiler_filter_flag) { + if (skip_compilation) { + strcpy(dex2oat_compiler_filter_arg, "--compiler-filter=interpret-only"); + have_dex2oat_compiler_filter_flag = true; + } else if (have_dex2oat_compiler_filter_flag) { sprintf(dex2oat_compiler_filter_arg, "--compiler-filter=%s", dex2oat_compiler_filter_flag); } |