commit 779da6444640c2ece962c942b6e967d12e92fd52
author Elliott Hughes <enh@google.com> Wed Feb 11 03:11:09 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 11 03:11:09 2015 +0000
tree 15d3c9207442eaefcc712355909c65acc75b0cec
parent 91f40d9bf56e4bb85fb46d0774296214353dae87
parent adf71bf71d0c3ecb68375c44fc8646860217024c

am adf71bf7: am 5db3f978: Merge "Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined"

* commit 'adf71bf71d0c3ecb68375c44fc8646860217024c':
  Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined

Android.mk

diff --git a/Android.mk b/Android.mk
index 5847ad9..e360c6b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -54,6 +54,8 @@
 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
 LOCAL_CFLAGS += -Wno-unused-parameter
 
+LOCAL_C_INCLUDES += system/vold
+
 LOCAL_STATIC_LIBRARIES := \
     libext4_utils_static \
     libsparse_static \
@@ -76,7 +78,7 @@
 
 ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
     LOCAL_CFLAGS += -DUSE_EXT4
-    LOCAL_C_INCLUDES += system/extras/ext4_utils system/vold
+    LOCAL_C_INCLUDES += system/extras/ext4_utils
     LOCAL_STATIC_LIBRARIES += libext4_utils_static libz
 endif