commit d4aed46c0459742a938122c6475666c9288f1068
author bigbiff <bigbiff@teamw.in> Mon May 18 11:26:23 2020 -0400
committer bigbiff <bigbiff@teamw.in> Tue May 19 14:53:54 2020 +0000
tree e7fcc4872d75ab4bd53a3c31e427909eef63a7bd
parent babc15ef613dbfae6256923723d3fbe93da36037

vold_decrypt: add missing includes for ext4 policies

Change-Id: Ic68360a13ee8b54cff1f7ec01d4ab1be00673266
(cherry picked from commit 5db50ded70efcea4fe8286689a764860861fdc16)

crypto/vold_decrypt/Android.mk

diff --git a/crypto/vold_decrypt/Android.mk b/crypto/vold_decrypt/Android.mk
index e70f61f..25d6ab0 100644
--- a/crypto/vold_decrypt/Android.mk
+++ b/crypto/vold_decrypt/Android.mk
@@ -17,7 +17,6 @@
 ifeq ($(TW_INCLUDE_CRYPTO), true)
     ifneq ($(TW_CRYPTO_USE_SYSTEM_VOLD),)
 
-
         # Parse TW_CRYPTO_USE_SYSTEM_VOLD
         ifeq ($(TW_CRYPTO_USE_SYSTEM_VOLD),true)
             # Just enabled, so only vold + vdc
@@ -115,6 +114,12 @@
 
         LOCAL_SRC_FILES = vold_decrypt.cpp
         LOCAL_SHARED_LIBRARIES := libcutils
+        LOCAL_C_INCLUDES += system/extras/ext4_utils/include
+        ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 29; echo $$?),0)
+            LOCAL_C_INCLUDES += bootable/recovery/crypto/fscrypt
+        else
+            LOCAL_C_INCLUDES += bootable/recovery/crypto/ext4crypt
+        endif
         include $(BUILD_STATIC_LIBRARY)
 
         ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)