commit 3cd669fd5d5317c21d75159d9caabffeb2d1f963
author Adrien Grassein <adrien.grassein@gmail.com> Thu Nov 06 14:53:50 2014 +0100
committer Adrien Grassein <adrien.grassein@gmail.com> Fri Nov 07 08:30:41 2014 +0100
tree 6b5c8e2a7bec9d8c3c54f8c2ca44099d357a497e
parent c7249660f908c74687b5fdadc1296eb9d4903cc7

Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined

The cryptfs.h files is always included, but its path is only included when TARGET_USERIMAGES_USE_EXT4 is defined.

Change-Id: Iec6aa4601a56a1feac456a21a53a08557dc1d00d

Android.mk

diff --git a/Android.mk b/Android.mk
index 1a91f00..4eb18aa 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 \
@@ -75,7 +77,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