commit d007cf2da29f05eee002dd33e6c04262f709b274
author Tianjie Xu <xunchang@google.com> Mon Feb 29 16:08:06 2016 -0800
committer Tianjie Xu <xunchang@google.com> Wed Nov 09 20:10:27 2016 +0000
tree 8e1c225954c62647a1aa2d598ca1d0c013c20efd
parent 52e2a97aa78898f9d9bf2ee887f2c3363e29c87b

Touch blocks in care_map in update_verifier

Read all blocks in system and vendor partition during boot time
so that dm-verity could verify this partition is properly flashed.

Bug: 27175949
Change-Id: I38ff7b18ee4f2733e639b89633d36f5ed551c989
Test: mma
(cherry picked from commit 03ca853a1c8b974152b7c56cb887ac2f36cfd833)
(cherry picked from commit 4bbe0c93c80789891d54a74424731caffda0d0db)
(Fix a typo when comparing the verity mode)
(cherry picked from commit da654af606d700c0a467c27025fb7f6ef745936d)
(Skip update verification if care_map is not found)

update_verifier/Android.mk

diff --git a/update_verifier/Android.mk b/update_verifier/Android.mk
index 8f5194d..8449c75 100644
--- a/update_verifier/Android.mk
+++ b/update_verifier/Android.mk
@@ -18,8 +18,15 @@
 
 LOCAL_CLANG := true
 LOCAL_SRC_FILES := update_verifier.cpp
+
 LOCAL_MODULE := update_verifier
-LOCAL_SHARED_LIBRARIES := libhardware libbase
+LOCAL_SHARED_LIBRARIES := \
+    libbase \
+    libcutils \
+    libhardware \
+    liblog
+
 LOCAL_CFLAGS := -Werror
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 include $(BUILD_EXECUTABLE)