commit ea982e865f3ca43e30d08037526642862ccacc8f
author Yabin Cui <yabinc@google.com> Thu Jun 30 23:11:19 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 30 23:11:19 2016 +0000
tree 07a7aef0f8e0faede9e8e0235d7682c04606a88e
parent ccfdbb99ef4f533eaf31009269d2abd715bfc62d
parent 84726a2c25647c90066b1dfed851206d56ab381b

Merge \\"init: use libbootloader_message.\\" into nyc-mr1-dev am: ca4cf4e4af
am: 1b8159e7ab

Change-Id: Ib66c41548140a19cbf8bada84ee0da985c8ac0a9

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index f83924e..36a5713 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -83,7 +83,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 4e3c12a..38b44b7 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -48,7 +48,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 <logwrap/logwrap.h>