From 1051e107f234cd5ce1fe159fd90756693555a5bd Mon Sep 17 00:00:00 2001
From: Yabin Cui <yabinc@google.com>
Date: Fri, 24 Jun 2016 18:28:03 -0700
Subject: [PATCH] init: use libbootloader_message.

Bug: 29582118
Change-Id: I6285b29774a11d6dda8496c7c73e4c1d17a672bd
(cherry picked from commit 0b1252cca0ecd5603e0fc0d5dadde91410b6b557)
---
 init/Android.mk   | 2 +-
 init/builtins.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/init/Android.mk b/init/Android.mk
index 704304e8f..1be064c57 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -82,7 +82,7 @@ LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_UNSTRIPPED)
 
 LOCAL_STATIC_LIBRARIES := \
     libinit \
-    libbootloader_message_writer \
+    libbootloader_message \
     libfs_mgr \
     libfec \
     libfec_rs \
diff --git a/init/builtins.cpp b/init/builtins.cpp
index da4b84ea2..f37ccc2fe 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>