Replace dexopt shared libraries with class loader context
Pass the class loader context to dex2oat with --class-loader-context
instead of using the runtime -cp argument.
(cherry picked from commit 1d66761379b54ff71094a7c722f131c591f3f897)
Test: adb shell cmd package compile a_split_test_apk
Bug: 38138251
Merged-In: I2e483969af8adf97291aa94f42e6da9ee5f1716b
Change-Id: I2e483969af8adf97291aa94f42e6da9ee5f1716b
diff --git a/cmds/installd/dexopt.h b/cmds/installd/dexopt.h
index b09eea2..23446da 100644
--- a/cmds/installd/dexopt.h
+++ b/cmds/installd/dexopt.h
@@ -63,7 +63,7 @@
int dexopt(const char *apk_path, uid_t uid, const char *pkgName, const char *instruction_set,
int dexopt_needed, const char* oat_dir, int dexopt_flags, const char* compiler_filter,
- const char* volume_uuid, const char* shared_libraries, const char* se_info,
+ const char* volume_uuid, const char* class_loader_context, const char* se_info,
bool downgrade);
} // namespace installd