update_engine: Change parameters of AttemptInstall() DBus
Currently, the update_engine is using the dlcservice's protobuf as
its own input. This is bad API because now anyone dependent on the
update_engine's DBus, needs to be dependent on the dlcservice too. This
CL changes that so we only pass the arguments we want (DLC DIs and the
omaha url).
BUG=chromium:1071654
TEST=cros_workon_make --board reef --test update_engine
Cq-Depend: chromium:2157670
Change-Id: Id7f7a86d8b3e3194d4d7697a8ad26ed4bcc4ba2c
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/2163442
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Andrew Lassalle <andrewlassalle@chromium.org>
Reviewed-by: Jae Hoon Kim <kimjae@chromium.org>
Commit-Queue: Amin Hassani <ahassani@chromium.org>
diff --git a/dbus_service.cc b/dbus_service.cc
index a5fec74..46ac1d1 100644
--- a/dbus_service.cc
+++ b/dbus_service.cc
@@ -19,7 +19,6 @@
#include <string>
#include <vector>
-#include <dlcservice/proto_bindings/dlcservice.pb.h>
#include <update_engine/dbus-constants.h>
#include "update_engine/dbus_connection.h"
@@ -30,7 +29,6 @@
using brillo::ErrorPtr;
using chromeos_update_engine::UpdateEngineService;
-using dlcservice::DlcModuleList;
using std::string;
using std::vector;
using update_engine::Operation;
@@ -82,17 +80,9 @@
}
bool DBusUpdateEngineService::AttemptInstall(ErrorPtr* error,
- const DlcModuleList& request) {
- vector<string> dlc_ids;
- for (const auto& dlc_module_info : request.dlc_module_infos()) {
- if (dlc_module_info.dlc_id().empty()) {
- *error = brillo::Error::Create(
- FROM_HERE, "update_engine", "INTERNAL", "Empty DLC ID passed.");
- return false;
- }
- dlc_ids.push_back(dlc_module_info.dlc_id());
- }
- return common_->AttemptInstall(error, request.omaha_url(), dlc_ids);
+ const string& in_omaha_url,
+ const vector<string>& dlc_ids) {
+ return common_->AttemptInstall(error, in_omaha_url, dlc_ids);
}
bool DBusUpdateEngineService::AttemptRollback(ErrorPtr* error,