Compile update_engine_client for non-Brillo targets.
The non-Brillo Android targets use the reduced binder interface. This
patch creates a similar update_engine_client command line tool to use
with the non-Brillo interface and compiles it for those targets.
Bug: 25631767
TEST=`mmma system/update_engine` on edison-eng and aosp_arm-eng.
Change-Id: I598144db2b703322c8469fa0982a70dc62572936
diff --git a/Android.mk b/Android.mk
index f24bf07..fe03b24 100644
--- a/Android.mk
+++ b/Android.mk
@@ -407,8 +407,6 @@
LOCAL_INIT_RC := update_engine.rc
include $(BUILD_EXECUTABLE)
-ifeq ($(local_use_dbus),1)
-
# update_engine_client (type: executable)
# ========================================================
# update_engine console client.
@@ -421,15 +419,30 @@
LOCAL_CPPFLAGS := $(ue_common_cppflags)
LOCAL_LDFLAGS := $(ue_common_ldflags)
LOCAL_C_INCLUDES := $(ue_common_c_includes)
-LOCAL_SHARED_LIBRARIES := \
- $(ue_common_shared_libraries) \
+LOCAL_SHARED_LIBRARIES := $(ue_common_shared_libraries)
+ifdef BRILLO
+LOCAL_SHARED_LIBRARIES += \
libupdate_engine_client
LOCAL_SRC_FILES := \
update_engine_client.cc
+else # !defined(BRILLO)
+#TODO(deymo): Remove external/cros/system_api/dbus once the strings are moved
+# out of the DBus interface.
+LOCAL_C_INCLUDES += \
+ external/cros/system_api/dbus
+LOCAL_SHARED_LIBRARIES += \
+ libbinder \
+ libbrillo-binder \
+ libutils
+LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/binder_bindings
+LOCAL_SRC_FILES := \
+ binder_bindings/android/os/IUpdateEngine.aidl \
+ binder_bindings/android/os/IUpdateEngineCallback.aidl \
+ update_engine_client_android.cc \
+ update_status_utils.cc
+endif # !defined(BRILLO)
include $(BUILD_EXECUTABLE)
-endif # local_use_dbus == 1
-
# libpayload_generator (type: static_library)
# ========================================================
# server-side code. This is used for delta_generator and unittests but not