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
diff --git a/cmds/installd/installd.cpp b/cmds/installd/installd.cpp
index eb51e70..e8fce91 100644
--- a/cmds/installd/installd.cpp
+++ b/cmds/installd/installd.cpp
@@ -266,7 +266,8 @@
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 @@
{ "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 },