am fe685787: Merge "Fix userdebug build."

* commit 'fe68578716290d93fd42005622adade8d345de3c':
  Fix userdebug build.
This commit is contained in:
Dan Albert 2015-01-27 02:18:48 +00:00 committed by Android Git Automerger
commit 72760253f0
2 changed files with 5 additions and 0 deletions

View file

@ -161,14 +161,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

View file

@ -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;