commit 72760253f02b9946caf2d0a452d2c8b3b19c8af6
author Dan Albert <danalbert@google.com> Tue Jan 27 02:18:48 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 27 02:18:48 2015 +0000
tree eb3c3a8b7cd662475e2be54543a1b2601b9b51b8
parent 3346eb65f978d53bc43d9cd73a65a486e83713e6
parent fe68578716290d93fd42005622adade8d345de3c

am fe685787: Merge "Fix userdebug build."

* commit 'fe68578716290d93fd42005622adade8d345de3c':
  Fix userdebug build.

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index dd32ad1..7317339 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -161,14 +161,17 @@
 LOCAL_FORCE_STATIC_EXECUTABLE := true
 LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN)
 LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)
+LOCAL_C_INCLUDES += system/extras/ext4_utils system/core/fs_mgr/include
 
 LOCAL_STATIC_LIBRARIES := \
     libadb \
+    libfs_mgr \
     liblog \
     libcutils \
     libc \
     libmincrypt \
     libselinux \
+    libext4_utils_static \
 
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 

adb/set_verity_enable_state_service.c

diff --git a/adb/set_verity_enable_state_service.c b/adb/set_verity_enable_state_service.c
index 051b9a4..2660ddd 100644
--- a/adb/set_verity_enable_state_service.c
+++ b/adb/set_verity_enable_state_service.c
@@ -26,6 +26,8 @@
 #include <inttypes.h>
 
 #include "cutils/properties.h"
+#include "ext4_sb.h"
+#include <fs_mgr.h>
 
 #define FSTAB_PREFIX "/fstab."
 struct fstab *fstab;