commit f5bebaef8dd12ff71baaf6fb4d4543db3615a6b4
author Sen Jiang <senj@google.com> Fri Jun 03 15:36:54 2016 -0700
committer Sen Jiang <senj@google.com> Mon Jun 13 13:28:11 2016 -0700
tree baa7560fa8ed9660db02fb39b5438032e3358237
parent 299128ee0f9009f79a62d5f57d75270f62353c9d

Add ConnectionManagerAndroid.

Just a stub implementation that always allow update right now.

Test: mma
Bug: 28800946

Change-Id: I4ff6164d459d142567d49a351f70128f5fc74b9f

Android.mk

diff --git a/Android.mk b/Android.mk
index 78cdbdf..9ec55a3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -307,7 +307,6 @@
 LOCAL_SRC_FILES := \
     boot_control_android.cc \
     common_service.cc \
-    connection_manager.cc \
     connection_utils.cc \
     daemon.cc \
     dbus_connection.cc \
@@ -325,7 +324,6 @@
     payload_state.cc \
     proxy_resolver.cc \
     real_system_state.cc \
-    shill_proxy.cc \
     update_attempter.cc \
     update_manager/boxed_value.cc \
     update_manager/chromeos_policy.cc \
@@ -344,6 +342,14 @@
     update_status_utils.cc \
     utils_android.cc \
     weave_service_factory.cc
+ifeq ($(local_use_dbus),1)
+LOCAL_SRC_FILES += \
+    connection_manager.cc \
+    shill_proxy.cc
+else   # local_use_dbus == 1
+LOCAL_SRC_FILES += \
+    connection_manager_android.cc
+endif  # local_use_dbus == 1
 ifeq ($(local_use_binder),1)
 LOCAL_AIDL_INCLUDES += $(LOCAL_PATH)/binder_bindings
 LOCAL_SRC_FILES += \