commit 4f60ac2bbc3c7fe502348a0739481287adff443c
author Calin Juravle <calin@google.com> Thu Aug 21 19:05:20 2014 +0100
committer Calin Juravle <calin@google.com> Wed Aug 27 16:16:05 2014 +0100
tree 1bfd2d5c0a3ac9db96e9934617a75d7692522b58
parent c70626a1ef18ef316a633ba0e399dbdf8f85973a

Add vm_safe_mode to dexopt.

The flag enforces interpret-only flag for dex2oat.

Bug: 12457423

(cherry picked from commit b1efac103523efccbe671e76cc0eaaeab810415b)
(cherry picked from commit 97477d203eaf0c3235bbe2415356f20a0431cada)

Change-Id: I215339527e998b24e274c8df42a5024839e6a9fa

cmds/installd/commands.c

diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c
index 7de29de..8d7ddc1 100644
--- a/cmds/installd/commands.c
+++ b/cmds/installd/commands.c
@@ -663,7 +663,8 @@
 }
 
 static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name,
-    const char* output_file_name, const char *pkgname, const char *instruction_set)
+    const char* output_file_name, const char *pkgname, const char *instruction_set,
+    bool vm_safe_mode)
 {
     static const unsigned int MAX_INSTRUCTION_SET_LEN = 7;
 
@@ -755,6 +756,9 @@
     if (skip_compilation) {
         strcpy(dex2oat_compiler_filter_arg, "--compiler-filter=verify-none");
         have_dex2oat_compiler_filter_flag = true;
+    } else if (vm_safe_mode) {
+        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);
     }
@@ -832,9 +836,9 @@
     }
 }
 
-int dexopt(const char *apk_path, uid_t uid, int is_public,
+int dexopt(const char *apk_path, uid_t uid, bool is_public,
            const char *pkgname, const char *instruction_set,
-           int is_patchoat)
+           bool vm_safe_mode, bool is_patchoat)
 {
     struct utimbuf ut;
     struct stat input_stat, dex_stat;
@@ -968,7 +972,8 @@
             if (is_patchoat) {
                 run_patchoat(input_fd, out_fd, input_file, out_path, pkgname, instruction_set);
             } else {
-                run_dex2oat(input_fd, out_fd, input_file, out_path, pkgname, instruction_set);
+                run_dex2oat(input_fd, out_fd, input_file, out_path, pkgname, instruction_set,
+                            vm_safe_mode);
             }
         } else {
             exit(69);   /* Unexpected persist.sys.dalvik.vm.lib value */