summaryrefslogtreecommitdiff
path: root/cmds/installd/installd.cpp
diff options
context:
space:
mode:
author Jeff Hao <jeffhao@google.com> 2016-03-16 15:59:25 -0700
committer Jeff Hao <jeffhao@google.com> 2016-04-27 11:13:10 -0700
commitb63d91fd2737680351876406277b6c759f4db33c (patch)
tree67b82e63cb7bd04214c4b04719dbf35445037345 /cmds/installd/installd.cpp
parent6cfb89c0bfe11c2ee513fe4df339ad753d4ad4ff (diff)
Support to pass <uses-library> option through to dex2oat.
This change takes an app's shared libraries specified by <uses-library> and passes it through to dex2oat to be used during compilation. Part of a multi-project change. Includes fix from c09662d9bbd35840b24cae8d336a0d11c0cbdb7b Bug: 26880306 (cherry-picked from commmit de7f0cf8a699f6f7a7d29b4a14d800bea9abbef4) Change-Id: Ideb2aba46f4cf52acb9dd480993513a60dbfd6ce
Diffstat (limited to 'cmds/installd/installd.cpp')
-rw-r--r--cmds/installd/installd.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/cmds/installd/installd.cpp b/cmds/installd/installd.cpp
index eb51e709de..e8fce91fd7 100644
--- a/cmds/installd/installd.cpp
+++ b/cmds/installd/installd.cpp
@@ -266,7 +266,8 @@ static int do_dexopt(char **arg, char reply[REPLY_MAX])
arg[5], // oat_dir
dexopt_flags,
arg[7], // compiler_filter
- parse_null(arg[8])); // volume_uuid
+ parse_null(arg[8]), // volume_uuid
+ parse_null(arg[9])); // shared_libraries
}
static int do_merge_profiles(char **arg, char reply[REPLY_MAX])
@@ -414,7 +415,7 @@ struct cmdinfo cmds[] = {
{ "create_user_data", 4, do_create_user_data },
{ "destroy_user_data", 3, do_destroy_user_data },
- { "dexopt", 9, do_dexopt },
+ { "dexopt", 10, do_dexopt },
{ "markbootcomplete", 1, do_mark_boot_complete },
{ "rmdex", 2, do_rm_dex },
{ "freecache", 2, do_free_cache },