commit 5db3f97877c0aafd4513c3ed846c48b0fc148b0e
author Elliott Hughes <enh@google.com> Wed Feb 11 01:37:49 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 11 01:37:49 2015 +0000
tree caf229a592b808d0cd552ed98415b21dcde015d8
parent 78aa50d3499e105d04e37ae3d3d92dad0d2c711c
parent 3cd669fd5d5317c21d75159d9caabffeb2d1f963

Merge "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