Fix missing dependencies when weave is disabled.
When compiling binder (but now weave) we were missing some
dependencies. This patch adds those to the right place and propagates
them to the executables using those.
Bug: 25908638
TEST=`m` on edison-eng with BRILLO_USE_BINDER=0
Change-Id: I2ddf86dc2f33ff87f079e7776da8256454f36ca2
diff --git a/Android.mk b/Android.mk
index ca87f62..676539f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -255,6 +255,14 @@
libcutils \
$(ue_libpayload_consumer_exported_shared_libraries) \
$(ue_update_metadata_protos_exported_shared_libraries)
+ifeq ($(local_use_binder),1)
+ue_libupdate_engine_exported_shared_libraries += \
+ libbinder \
+ libbinderwrapper \
+ libbrillo-binder \
+ libutils
+endif # local_use_binder == 1
+
ifeq ($(local_use_weave),1)
ue_libupdate_engine_exported_shared_libraries += \
libbinderwrapper \
@@ -338,10 +346,6 @@
binder_bindings/android/brillo/IUpdateEngineStatusCallback.aidl \
binder_service.cc \
parcelable_update_engine_status.cc
-
-LOCAL_SHARED_LIBRARIES += \
- libbinder \
- libutils
endif # local_use_binder == 1
include $(BUILD_STATIC_LIBRARY)