Remove the use of --updatable-bcp-packages-fd from odrefresh.
Historically, this flag is used when compiling system server to prevent
artifacts from being invalidated after a mainline update. We are now
re-compiling system server after every mainline update, so this flag
is no longer needed.
System property `dalvik.vm.dex2oat-updatable-bcp-packages-file` and
code in dex2oat that related to the flag will be cleaned up in
subsequent CLs.
Bug: 200241946
Test: atest art_standalone_odrefresh_tests
Test: atest odsign_e2e_tests
Change-Id: I62a4b1a0a8750d55a8a59a5fa8618bfcfd0a7eca
diff --git a/odrefresh/odr_config.h b/odrefresh/odr_config.h
index 6764e2c..48327f6 100644
--- a/odrefresh/odr_config.h
+++ b/odrefresh/odr_config.h
@@ -52,7 +52,6 @@
InstructionSet isa_;
std::string program_name_;
std::string system_server_classpath_;
- std::string updatable_bcp_packages_file_;
ZygoteKind zygote_kind_;
std::string compilation_os_address_;
std::string boot_classpath_;
@@ -121,8 +120,9 @@
}
bool GetDryRun() const { return dry_run_; }
- const std::string& GetSystemServerClasspath() const { return system_server_classpath_; }
- const std::string& GetUpdatableBcpPackagesFile() const { return updatable_bcp_packages_file_; }
+ const std::string& GetSystemServerClasspath() const {
+ return system_server_classpath_;
+ }
bool UseCompilationOs() const { return !compilation_os_address_.empty(); }
const std::string& GetCompilationOsAddress() const {
return compilation_os_address_;
@@ -146,7 +146,6 @@
system_server_classpath_ = classpath;
}
- void SetUpdatableBcpPackagesFile(const std::string& file) { updatable_bcp_packages_file_ = file; }
void SetZygoteKind(ZygoteKind zygote_kind) { zygote_kind_ = zygote_kind; }
const std::string& GetBootClasspath() const { return boot_classpath_; }
diff --git a/odrefresh/odrefresh.cc b/odrefresh/odrefresh.cc
index af78b1a..a984413 100644
--- a/odrefresh/odrefresh.cc
+++ b/odrefresh/odrefresh.cc
@@ -1466,19 +1466,6 @@
}
args.emplace_back("--oat-location=" + artifacts.OatPath());
- if (!config_.GetUpdatableBcpPackagesFile().empty()) {
- const std::string& bcp_packages = config_.GetUpdatableBcpPackagesFile();
- if (!OS::FileExists(bcp_packages.c_str())) {
- *error_msg = "Cannot compile system_server JARs: missing " + QuotePath(bcp_packages);
- metrics.SetStatus(OdrMetrics::Status::kIoError);
- EraseFiles(staging_files);
- return false;
- }
- std::unique_ptr<File> file(OS::OpenFileForReading(bcp_packages.c_str()));
- args.emplace_back(android::base::StringPrintf("--updatable-bcp-packages-fd=%d", file->Fd()));
- readonly_files_raii.push_back(std::move(file));
- }
-
args.emplace_back("--runtime-arg");
args.emplace_back(Concatenate({"-Xbootclasspath:", config_.GetBootClasspath()}));
auto bcp_jars = android::base::Split(config_.GetBootClasspath(), ":");
diff --git a/odrefresh/odrefresh_main.cc b/odrefresh/odrefresh_main.cc
index 8dc39f0..93ce5fb 100644
--- a/odrefresh/odrefresh_main.cc
+++ b/odrefresh/odrefresh_main.cc
@@ -167,8 +167,6 @@
config->SetIsa(art::GetInstructionSetFromString(value.c_str()));
} else if (ArgumentMatches(arg, "--system-server-classpath=", &value)) {
config->SetSystemServerClasspath(arg);
- } else if (ArgumentMatches(arg, "--updatable-bcp-packages-file=", &value)) {
- config->SetUpdatableBcpPackagesFile(value);
} else if (ArgumentMatches(arg, "--zygote-arch=", &value)) {
ZygoteKind zygote_kind;
if (!ParseZygoteKind(value.c_str(), &zygote_kind)) {
@@ -197,10 +195,6 @@
}
config->SetZygoteKind(zygote_kind);
- const std::string updatable_packages =
- android::base::GetProperty("dalvik.vm.dex2oat-updatable-bcp-packages-file", {});
- config->SetUpdatableBcpPackagesFile(updatable_packages);
-
int n = 1;
for (; n < argc - 1; ++n) {
const char* arg = argv[n];