summaryrefslogtreecommitdiff
path: root/boot_control_copy
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-03-31 10:07:52 -0700
committerTao Bao <tbao@google.com>2018-03-31 10:08:27 -0700
commit129b4bc7f234febb56fb4948a7f364e5884316cf (patch)
tree87c2cd1b21fcbea545063098c5bd13905a820a9b /boot_control_copy
parent51d1b2889eb6369c2fe41ff630b3aae920c78061 (diff)
downloadextras-129b4bc7f234febb56fb4948a7f364e5884316cf.tar.gz
boot_control_copy: Use libbootloader_message.
<bootloader.h> has been exported by libbootloader_message as <bootloader_message/bootloader_message.h>. Test: mmma -j system/extras/boot_control_copy Change-Id: I013bbb393906a19acd95f3c5fb8905f7aa0d7ed1
Diffstat (limited to 'boot_control_copy')
-rw-r--r--boot_control_copy/Android.mk3
-rw-r--r--boot_control_copy/bootinfo.cpp3
2 files changed, 2 insertions, 4 deletions
diff --git a/boot_control_copy/Android.mk b/boot_control_copy/Android.mk
index 93f17065..8ed3273f 100644
--- a/boot_control_copy/Android.mk
+++ b/boot_control_copy/Android.mk
@@ -5,10 +5,9 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := boot_control_copy.cpp bootinfo.cpp
LOCAL_CFLAGS := -Wall -Werror -Wno-missing-field-initializers -Wno-unused-parameter
-LOCAL_C_INCLUDES := bootable/recovery
LOCAL_HEADER_LIBRARIES := bootimg_headers
LOCAL_SHARED_LIBRARIES := libbase libcutils
-LOCAL_STATIC_LIBRARIES := libfs_mgr
+LOCAL_STATIC_LIBRARIES := libbootloader_message libfs_mgr
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_MODULE:= bootctrl.default
diff --git a/boot_control_copy/bootinfo.cpp b/boot_control_copy/bootinfo.cpp
index f21fe843..aa7643a4 100644
--- a/boot_control_copy/bootinfo.cpp
+++ b/boot_control_copy/bootinfo.cpp
@@ -28,9 +28,8 @@
#include <stdlib.h>
#include <string.h>
+#include <bootloader_message/bootloader_message.h>
#include <cutils/properties.h>
-
-#include <bootloader.h>
#include <fs_mgr.h>
#include "bootinfo.h"