commit 78f9d265f0572c9d346db03988fd84224452592f
author Yabin Cui <yabinc@google.com> Fri Jun 24 18:28:03 2016 -0700
committer Tao Bao <tbao@google.com> Tue Oct 18 11:37:52 2016 -0700
tree 965555045cd1615bc450e111483bc2ddff7ed5cb
parent f18bf4cbccd691ecf814c974f3841a5a0c2092d9

init: use libbootloader_message.

Bug: 29582118
Change-Id: I6285b29774a11d6dda8496c7c73e4c1d17a672bd
(cherry picked from commit 0b1252cca0ecd5603e0fc0d5dadde91410b6b557)

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index 704304e..1be064c 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -82,7 +82,7 @@
 
 LOCAL_STATIC_LIBRARIES := \
     libinit \
-    libbootloader_message_writer \
+    libbootloader_message \
     libfs_mgr \
     libfec \
     libfec_rs \

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index da4b84e..f37ccc2 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -46,7 +46,7 @@
 #include <android-base/parseint.h>
 #include <android-base/strings.h>
 #include <android-base/stringprintf.h>
-#include <bootloader_message_writer.h>
+#include <bootloader_message/bootloader_message.h>
 #include <cutils/partition_utils.h>
 #include <cutils/android_reboot.h>
 #include <ext4_utils/ext4_crypt.h>