commit f36873504703bb43d785589ef797c3368b58b34c
author Amin Hassani <ahassani@chromium.org> Tue Nov 10 10:41:40 2020 -0800
committer Commit Bot <commit-bot@chromium.org> Wed Nov 11 04:34:36 2020 +0000
tree e60c2638323ec87583234f31900d5879e464eeb7
parent 64a80160593434d07ee1d00364bf88a56496f694

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>

update_manager/state_factory.cc

diff --git a/update_manager/state_factory.cc b/update_manager/state_factory.cc
index a95a5a8..2168974 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 @@
   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 @@
 
   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";