commit 1dfd1df2e3559090a48b8f96c5a536830e1de0bd
author Tao Bao <tbao@google.com> Tue Oct 18 21:48:22 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 18 21:48:23 2016 +0000
tree 1a10c55f2bb850a81f61b5144d8ed4f7dabfe5d6
parent 6a18a6ddb512bbdd26f27749b601ba041059db06
parent 889ed48e5f062b8bce85fcec2b01ee0bff77c02e

Merge "Use libbootloader_message."

Android.mk

diff --git a/Android.mk b/Android.mk
index 3d99a02..59a7ef4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -60,7 +60,7 @@
 	libkeymaster_messages \
 
 common_static_libraries := \
-	libbootloader_message_writer \
+	libbootloader_message \
 	libfs_mgr \
 	libfec \
 	libfec_rs \

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index dc6ed4c..a3ab2b9 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -62,7 +62,7 @@
 #include "CheckBattery.h"
 #include "Process.h"
 
-#include <bootloader_message_writer.h>
+#include <bootloader_message/bootloader_message.h>
 #include <hardware/keymaster0.h>
 #include <hardware/keymaster1.h>