Compile the entire bootclasspath on device.
Most of the changes in this CL are renaming and comment changes. The
main behavior changes are:
1. Adding all bootclasspath jars (including the ones in the ART APEX) to
`--dex-file` and `--dex-fd`.
2. Adding both the ART boot profile and the framework profile to
`--profile-fd`.
3. Replacing the `--boot-image` flag with `--base` for compiling boot
classpath jars.
4. Renaming the boot image on /data from `boot-framework.art` to
`boot.art`.
5. Updating the `--boot-image` flag for compiling system_server jars.
6. Updating the default boot image location that the runtime uses.
Bug: 203492478
Test: atest art_standalone_odrefresh_tests
Test: atest art_standalone_artd_tests
Test: atest odsign_e2e_tests
Change-Id: If56bc96ec6f38335f3e8e1ad3085e231baacb6fc
diff --git a/odrefresh/odrefresh_main.cc b/odrefresh/odrefresh_main.cc
index 8262805..f93ee93 100644
--- a/odrefresh/odrefresh_main.cc
+++ b/odrefresh/odrefresh_main.cc
@@ -185,16 +185,14 @@
NO_RETURN void UsageHelp(const char* argv0) {
std::string name(android::base::Basename(argv0));
UsageMsg("Usage: %s [OPTION...] ACTION", name.c_str());
- UsageMsg("On-device refresh tool for boot class path extensions and system server");
+ UsageMsg("On-device refresh tool for boot classpath and system server");
UsageMsg("following an update of the ART APEX.");
UsageMsg("");
UsageMsg("Valid ACTION choices are:");
UsageMsg("");
UsageMsg("--check Check compilation artifacts are up-to-date based on metadata.");
- UsageMsg("--compile Compile boot class path extensions and system_server jars");
- UsageMsg(" when necessary.");
- UsageMsg("--force-compile Unconditionally compile the boot class path extensions and");
- UsageMsg(" system_server jars.");
+ UsageMsg("--compile Compile boot classpath and system_server jars when necessary.");
+ UsageMsg("--force-compile Unconditionally compile the bootclass path and system_server jars.");
UsageMsg("--help Display this help information.");
UsageMsg("");
UsageMsg("Available OPTIONs are:");
@@ -270,8 +268,8 @@
}
return odr.Compile(metrics,
CompilationOptions{
- .compile_boot_extensions_for_isas = config.GetBootExtensionIsas(),
- .system_server_jars_to_compile = odr.AllSystemServerJars(),
+ .compile_boot_classpath_for_isas = config.GetBootClasspathIsas(),
+ .system_server_jars_to_compile = odr.AllSystemServerJars(),
});
} else if (action == "--help") {
UsageHelp(argv[0]);