From d4a7b459f4f383988440c0512513b321ce03fc22 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Fri, 20 Mar 2015 15:39:47 -0700 Subject: [PATCH] Use verify-at-runtime if debug.usejit is true Bug: 19735273 Change-Id: Ib65b50dbde00184544a1341f351a0fe0ef504d32 --- cmds/installd/commands.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c index d9376e1fe..9133a3434 100644 --- a/cmds/installd/commands.c +++ b/cmds/installd/commands.c @@ -749,6 +749,10 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name, (strcmp(vold_decrypt, "trigger_restart_min_framework") == 0 || (strcmp(vold_decrypt, "1") == 0))); + char use_jit_property[PROPERTY_VALUE_MAX]; + bool have_jit_property = property_get("debug.usejit", use_jit_property, NULL) > 0; + bool use_jit = have_jit_property && strcmp(use_jit_property, "true") == 0; + static const char* DEX2OAT_BIN = "/system/bin/dex2oat"; static const char* RUNTIME_ARG = "--runtime-arg"; @@ -813,6 +817,9 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name, } else if (vm_safe_mode) { strcpy(dex2oat_compiler_filter_arg, "--compiler-filter=interpret-only"); have_dex2oat_compiler_filter_flag = true; + } else if (use_jit) { + strcpy(dex2oat_compiler_filter_arg, "--compiler-filter=verify-at-runtime"); + 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); }