diff options
| author | Amin Hassani <ahassani@chromium.org> | 2020-11-10 10:41:40 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-11-11 04:34:36 +0000 |
| commit | f36873504703bb43d785589ef797c3368b58b34c (patch) | |
| tree | e60c2638323ec87583234f31900d5879e464eeb7 | |
| parent | 64a80160593434d07ee1d00364bf88a56496f694 (diff) | |
update_engine: Turn on Shill by default
This flag is always true in Chorme OS and android's code doesn't compile
this. So the flag can be removed and be turned on by default.
BUG=b:171829801
TEST=cros_workon_make --board reef --test
Change-Id: I3520cd4313bf3bff0d6f3f3775e35f8cf29f6322
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/2529870
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Jae Hoon Kim <kimjae@chromium.org>
Commit-Queue: Amin Hassani <ahassani@chromium.org>
| -rw-r--r-- | BUILD.gn | 1 | ||||
| -rw-r--r-- | update_manager/state_factory.cc | 12 |
2 files changed, 2 insertions, 11 deletions
@@ -81,7 +81,6 @@ pkg_config("target_defaults") { "USE_DBUS=${use.dbus}", "USE_FEC=0", "USE_HWID_OVERRIDE=${use.hwid_override}", - "USE_SHILL=1", ] include_dirs = [ # We need this include dir because we include all the local code as diff --git a/update_manager/state_factory.cc b/update_manager/state_factory.cc index a95a5a8f..21689744 100644 --- a/update_manager/state_factory.cc +++ b/update_manager/state_factory.cc @@ -27,18 +27,16 @@ #if USE_DBUS #include "update_engine/cros/dbus_connection.h" #endif // USE_DBUS +#include "update_engine/cros/shill_proxy.h" #include "update_engine/update_manager/fake_shill_provider.h" #include "update_engine/update_manager/real_config_provider.h" #include "update_engine/update_manager/real_device_policy_provider.h" #include "update_engine/update_manager/real_random_provider.h" +#include "update_engine/update_manager/real_shill_provider.h" #include "update_engine/update_manager/real_state.h" #include "update_engine/update_manager/real_system_provider.h" #include "update_engine/update_manager/real_time_provider.h" #include "update_engine/update_manager/real_updater_provider.h" -#if USE_SHILL -#include "update_engine/cros/shill_proxy.h" -#include "update_engine/update_manager/real_shill_provider.h" -#endif // USE_SHILL using std::unique_ptr; @@ -62,12 +60,8 @@ State* DefaultStateFactory( unique_ptr<RealDevicePolicyProvider> device_policy_provider( new RealDevicePolicyProvider(policy_provider)); #endif // USE_DBUS -#if USE_SHILL unique_ptr<RealShillProvider> shill_provider( new RealShillProvider(new chromeos_update_engine::ShillProxy(), clock)); -#else - unique_ptr<FakeShillProvider> shill_provider(new FakeShillProvider()); -#endif // USE_SHILL unique_ptr<RealRandomProvider> random_provider(new RealRandomProvider()); unique_ptr<RealSystemProvider> system_provider( new RealSystemProvider(system_state, kiosk_app_proxy)); @@ -78,9 +72,7 @@ State* DefaultStateFactory( if (!(config_provider->Init() && device_policy_provider->Init() && random_provider->Init() && -#if USE_SHILL shill_provider->Init() && -#endif // USE_SHILL system_provider->Init() && time_provider->Init() && updater_provider->Init())) { LOG(ERROR) << "Error initializing providers"; |