diff options
author | Todd Kennedy <toddke@google.com> | 2015-09-24 20:35:07 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-09-24 20:35:07 +0000 |
commit | 7f413889a3f0bff0c159141abb498650305f2089 (patch) | |
tree | 950ebf44c8d28bd47e88f37187327c22f7d4d83f | |
parent | 0830bb169717f920817e66afb18abe2c86d20161 (diff) | |
parent | 13f141910ba383404145924df64ad6626fe5b42f (diff) | |
download | native-7f413889a3f0bff0c159141abb498650305f2089.tar.gz |
Merge "Installd: Take boot status as dexopt parameter"
-rw-r--r-- | cmds/installd/commands.cpp | 15 | ||||
-rw-r--r-- | cmds/installd/installd.cpp | 6 | ||||
-rw-r--r-- | cmds/installd/installd.h | 2 |
3 files changed, 7 insertions, 16 deletions
diff --git a/cmds/installd/commands.cpp b/cmds/installd/commands.cpp index adff72ec46..fbe42f4952 100644 --- a/cmds/installd/commands.cpp +++ b/cmds/installd/commands.cpp @@ -1030,14 +1030,6 @@ static bool calculate_odex_file_path(char path[PKG_PATH_MAX], return true; } -static bool IsPostBootComplete() { - char dev_bootcomplete_prop_buf[PROPERTY_VALUE_MAX]; - if (property_get("dev.bootcomplete", dev_bootcomplete_prop_buf, "0") > 0) { - return (strcmp(dev_bootcomplete_prop_buf, "1") == 0); - } - return false; -} - static void SetDex2OatAndPatchOatScheduling(bool set_to_bg) { if (set_to_bg) { if (set_sched_policy(0, SP_BACKGROUND) < 0) { @@ -1053,7 +1045,7 @@ static void SetDex2OatAndPatchOatScheduling(bool set_to_bg) { int dexopt(const char *apk_path, uid_t uid, bool is_public, const char *pkgname, const char *instruction_set, int dexopt_needed, - bool vm_safe_mode, bool debuggable, const char* oat_dir) + bool vm_safe_mode, bool debuggable, const char* oat_dir, bool boot_complete) { struct utimbuf ut; struct stat input_stat; @@ -1062,7 +1054,6 @@ int dexopt(const char *apk_path, uid_t uid, bool is_public, const char *input_file; char in_odex_path[PKG_PATH_MAX]; int res, input_fd=-1, out_fd=-1, swap_fd=-1; - bool post_bootcomplete = IsPostBootComplete(); // Early best-effort check whether we can fit the the path into our buffers. // Note: the cache path will require an additional 5 bytes for ".swap", but we'll try to run @@ -1185,7 +1176,7 @@ int dexopt(const char *apk_path, uid_t uid, bool is_public, ALOGE("capset failed: %s\n", strerror(errno)); exit(66); } - SetDex2OatAndPatchOatScheduling(post_bootcomplete); + SetDex2OatAndPatchOatScheduling(boot_complete); if (flock(out_fd, LOCK_EX | LOCK_NB) != 0) { ALOGE("flock(%s) failed: %s\n", out_path, strerror(errno)); exit(67); @@ -1202,7 +1193,7 @@ int dexopt(const char *apk_path, uid_t uid, bool is_public, input_file_name++; } run_dex2oat(input_fd, out_fd, input_file_name, out_path, swap_fd, pkgname, - instruction_set, vm_safe_mode, debuggable, post_bootcomplete); + instruction_set, vm_safe_mode, debuggable, boot_complete); } else { ALOGE("Invalid dexopt needed: %d\n", dexopt_needed); exit(73); diff --git a/cmds/installd/installd.cpp b/cmds/installd/installd.cpp index 3a861812f4..3d82663bf0 100644 --- a/cmds/installd/installd.cpp +++ b/cmds/installd/installd.cpp @@ -48,9 +48,9 @@ static int do_install(char **arg, char reply[REPLY_MAX] __unused) static int do_dexopt(char **arg, char reply[REPLY_MAX] __unused) { /* apk_path, uid, is_public, pkgname, instruction_set, - * dexopt_needed, vm_safe_mode, debuggable, oat_dir */ + * dexopt_needed, vm_safe_mode, debuggable, oat_dir, boot_complete */ return dexopt(arg[0], atoi(arg[1]), atoi(arg[2]), arg[3], arg[4], atoi(arg[5]), - atoi(arg[6]), atoi(arg[7]), arg[8]); + atoi(arg[6]), atoi(arg[7]), arg[8], atoi(arg[9])); } static int do_mark_boot_complete(char **arg, char reply[REPLY_MAX] __unused) @@ -188,7 +188,7 @@ struct cmdinfo { struct cmdinfo cmds[] = { { "ping", 0, do_ping }, { "install", 5, do_install }, - { "dexopt", 9, do_dexopt }, + { "dexopt", 10, do_dexopt }, { "markbootcomplete", 1, do_mark_boot_complete }, { "movedex", 3, do_move_dex }, { "rmdex", 2, do_rm_dex }, diff --git a/cmds/installd/installd.h b/cmds/installd/installd.h index f31bf4f2a5..535e80ce96 100644 --- a/cmds/installd/installd.h +++ b/cmds/installd/installd.h @@ -236,7 +236,7 @@ int get_size(const char *uuid, const char *pkgname, userid_t userid, const char int free_cache(const char *uuid, int64_t free_size); int dexopt(const char *apk_path, uid_t uid, bool is_public, const char *pkgName, const char *instruction_set, int dexopt_needed, bool vm_safe_mode, - bool debuggable, const char* oat_dir); + bool debuggable, const char* oat_dir, bool boot_complete); int mark_boot_complete(const char *instruction_set); int movefiles(); int linklib(const char* uuid, const char* pkgname, const char* asecLibDir, int userId); |