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/client_library/client_dbus.cc b/client_library/client_dbus.cc
index 4ec76c5..5ca519a 100644
--- a/client_library/client_dbus.cc
+++ b/client_library/client_dbus.cc
@@ -21,7 +21,6 @@
#include <memory>
#include <dbus/bus.h>
-#include <dlcservice/proto_bindings/dlcservice.pb.h>
#include <update_engine/dbus-constants.h>
#include "update_engine/update_status_utils.h"
@@ -86,16 +85,7 @@
bool DBusUpdateEngineClient::AttemptInstall(const string& omaha_url,
const vector<string>& dlc_ids) {
- // Convert parameters into protobuf.
- dlcservice::DlcModuleList dlc_parameters;
- dlc_parameters.set_omaha_url(omaha_url);
- for (const auto& dlc_id : dlc_ids) {
- dlcservice::DlcModuleInfo* dlc_module_info =
- dlc_parameters.add_dlc_module_infos();
- dlc_module_info->set_dlc_id(dlc_id);
- }
- return proxy_->AttemptInstall(dlc_parameters,
- nullptr /* brillo::ErrorPtr* */);
+ return proxy_->AttemptInstall(omaha_url, dlc_ids, nullptr);
}
bool DBusUpdateEngineClient::SetDlcActiveValue(bool is_active,