commit ce90f4462dda5b15ec8abeb949a95d99e2f51f08
author Casey Dahlin <sadmac@google.com> Mon Jan 25 16:55:28 2016 -0800
committer Alex Deymo <deymo@google.com> Wed Jan 27 21:52:20 2016 -0800
tree 8e886c1911c9c672c72f1dae4134272096c392fd
parent 50e24f437da9f47f97315dc9e11b2ba20a3dd829

Remove unused dependencies in the client.

The update_engine_client binary doesn't depend on a particular backend
anymore, since the client library hides all the IPC. This CL removes
the backend-scpecific dependencies from update_engine_client and
relies on the ones specified in the libupdate_engine_client.

Bug: 25908638
TEST=`mmma system/update_engine` on brillo-eng and aosp_arm-eng.
TEST=emerge-link update_engine

Change-Id: Idffb9393eefadeb89eff8e44d07209dac4078035

Android.mk

diff --git a/Android.mk b/Android.mk
index 27f9aec..f24bf07 100644
--- a/Android.mk
+++ b/Android.mk
@@ -420,13 +420,9 @@
 LOCAL_CFLAGS := $(ue_common_cflags)
 LOCAL_CPPFLAGS := $(ue_common_cppflags)
 LOCAL_LDFLAGS := $(ue_common_ldflags)
-LOCAL_C_INCLUDES := \
-    $(ue_common_c_includes) \
-    $(LOCAL_PATH)/include
-LOCAL_STATIC_LIBRARIES := update_engine_client-dbus-proxies
+LOCAL_C_INCLUDES := $(ue_common_c_includes)
 LOCAL_SHARED_LIBRARIES := \
     $(ue_common_shared_libraries) \
-    libutils \
     libupdate_engine_client
 LOCAL_SRC_FILES := \
     update_engine_client.cc

update_engine.gyp

diff --git a/update_engine.gyp b/update_engine.gyp
index 84c9159..0a40a51 100644
--- a/update_engine.gyp
+++ b/update_engine.gyp
@@ -330,13 +330,6 @@
       'dependencies': [
         'libupdate_engine_client',
       ],
-      'variables': {
-        'exported_deps': [
-          'libupdate_engine-client',
-          'dbus-1',
-        ],
-        'deps': ['<@(exported_deps)'],
-      },
       'sources': [
         'update_engine_client.cc',
       ],