commit 304680c2ba25c54eb641b6cb72d1a85b363652e3
author Tao Bao <tbao@google.com> Sat Mar 31 10:36:52 2018 -0700
committer Tao Bao <tbao@google.com> Sat Mar 31 10:42:58 2018 -0700
tree 41a8fe151b1ef81a152ec8075f6da7ac3d08f456
parent 2bb8ddea03f7d7c4423c85b52e2107e87ab3091a

Add the dependency on libbootloader_message.

<bootloader.h> has been exported by libbootloader_message as
<bootloader_message/bootloader_message.h>.

Also drop the header include for libupdate_engine_boot_control which
doesn't use the header.

Test: mmma -j system/update_engine
Test: update_engine_unittests
Change-Id: Iacfb5b2d651243222c7ad797a67a4285ef680ca1

Android.mk

diff --git a/Android.mk b/Android.mk
index d2a83bc..59216db 100644
--- a/Android.mk
+++ b/Android.mk
@@ -215,8 +215,7 @@
 LOCAL_CPPFLAGS := $(ue_common_cppflags)
 LOCAL_LDFLAGS := $(ue_common_ldflags)
 LOCAL_C_INCLUDES := \
-    $(ue_common_c_includes) \
-    bootable/recovery
+    $(ue_common_c_includes)
 LOCAL_STATIC_LIBRARIES := \
     $(ue_common_static_libraries) \
     $(ue_libupdate_engine_boot_control_exported_static_libraries)
@@ -238,6 +237,7 @@
 ue_libupdate_engine_exported_static_libraries := \
     libpayload_consumer \
     update_metadata-protos \
+    libbootloader_message \
     libbz \
     libfs_mgr \
     libbase \
@@ -274,8 +274,7 @@
 LOCAL_LDFLAGS := $(ue_common_ldflags)
 LOCAL_C_INCLUDES := \
     $(ue_common_c_includes) \
-    $(ue_libupdate_engine_exported_c_includes) \
-    bootable/recovery
+    $(ue_libupdate_engine_exported_c_includes)
 LOCAL_STATIC_LIBRARIES := \
     libpayload_consumer \
     update_metadata-protos \
@@ -355,6 +354,7 @@
 # loop to apply payloads provided by the upper layer via a Binder interface.
 ue_libupdate_engine_android_exported_static_libraries := \
     libpayload_consumer \
+    libbootloader_message \
     libfs_mgr \
     libbase \
     liblog \
@@ -382,8 +382,7 @@
 LOCAL_CPPFLAGS := $(ue_common_cppflags)
 LOCAL_LDFLAGS := $(ue_common_ldflags)
 LOCAL_C_INCLUDES := \
-    $(ue_common_c_includes) \
-    bootable/recovery
+    $(ue_common_c_includes)
 #TODO(deymo): Remove external/cros/system_api/dbus once the strings are moved
 # out of the DBus interface.
 LOCAL_C_INCLUDES += \
@@ -471,8 +470,7 @@
 LOCAL_CPPFLAGS := $(ue_common_cppflags)
 LOCAL_LDFLAGS := $(ue_common_ldflags)
 LOCAL_C_INCLUDES := \
-    $(ue_common_c_includes) \
-    bootable/recovery
+    $(ue_common_c_includes)
 #TODO(deymo): Remove external/cros/system_api/dbus once the strings are moved
 # out of the DBus interface.
 LOCAL_C_INCLUDES += \
@@ -489,6 +487,7 @@
     update_status_utils.cc \
     utils_android.cc
 LOCAL_STATIC_LIBRARIES := \
+    libbootloader_message \
     libfs_mgr \
     libbase \
     liblog \