From 030b76fc1d2884b8bafb2bdcd4d9947b351d627d Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Mon, 26 Jan 2015 17:13:54 -0800 Subject: [PATCH] Fix userdebug build. Apparently this code I thought was unused is just unused for eng builds... Bug: 17626262 Change-Id: I2e5f411a2ead7f23d9f5822935de66c992750a03 --- adb/Android.mk | 3 +++ adb/set_verity_enable_state_service.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/adb/Android.mk b/adb/Android.mk index cbb49f483..30cbbaa26 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -162,14 +162,17 @@ LOCAL_MODULE := adbd 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 diff --git a/adb/set_verity_enable_state_service.c b/adb/set_verity_enable_state_service.c index 051b9a46a..2660ddd73 100644 --- a/adb/set_verity_enable_state_service.c +++ b/adb/set_verity_enable_state_service.c @@ -26,6 +26,8 @@ #include #include "cutils/properties.h" +#include "ext4_sb.h" +#include #define FSTAB_PREFIX "/fstab." struct fstab *fstab;