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
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 \
diff --git a/hardware_android.cc b/hardware_android.cc
index 58c68b6..c0b87ce 100644
--- a/hardware_android.cc
+++ b/hardware_android.cc
@@ -23,11 +23,10 @@
#include <algorithm>
#include <memory>
-#include <bootloader.h>
-
#include <android-base/properties.h>
#include <base/files/file_util.h>
#include <base/strings/stringprintf.h>
+#include <bootloader_message/bootloader_message.h>
#include "update_engine/common/hardware.h"
#include "update_engine/common/platform_constants.h"
diff --git a/image_properties_android.cc b/image_properties_android.cc
index 4dc2c02..1d82feb 100644
--- a/image_properties_android.cc
+++ b/image_properties_android.cc
@@ -23,7 +23,7 @@
#include <android-base/properties.h>
#include <base/logging.h>
#include <base/strings/string_util.h>
-#include <bootloader.h>
+#include <bootloader_message/bootloader_message.h>
#include <brillo/osrelease_reader.h>
#include <brillo/strings/string_utils.h>
