diff options
| author | Tao Bao <tbao@google.com> | 2018-04-02 16:13:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-02 16:13:19 +0000 |
| commit | af675a3bca77fb9809ac39ba7363219b41dbaf18 (patch) | |
| tree | 87c2cd1b21fcbea545063098c5bd13905a820a9b | |
| parent | 51d1b2889eb6369c2fe41ff630b3aae920c78061 (diff) | |
| parent | 129b4bc7f234febb56fb4948a7f364e5884316cf (diff) | |
| download | extras-af675a3bca77fb9809ac39ba7363219b41dbaf18.tar.gz | |
Merge "boot_control_copy: Use libbootloader_message."
| -rw-r--r-- | boot_control_copy/Android.mk | 3 | ||||
| -rw-r--r-- | boot_control_copy/bootinfo.cpp | 3 |
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" |