From: Iliyan Malchev <malchev@google.com>
Date: Fri, 21 Nov 2014 08:52:40 +0000 (-0800)
Subject: resolved conflicts for merge of 87701e27 to lmp-mr1-dev-plus-aosp
X-Git-Tag: android-x86-6.0-r1~148
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b7d35115dccc49275c48cc4665c146997b0168eb;p=android-x86%2Fsystem-vold.git

resolved conflicts for merge of 87701e27 to lmp-mr1-dev-plus-aosp

Change-Id: Ie873baff626fe786515497f2e81aa9db2329168d
---

b7d35115dccc49275c48cc4665c146997b0168eb
diff --cc Android.mk
index 05d75fa,d90b1c2..419fe5c
--- a/Android.mk
+++ b/Android.mk
@@@ -75,11 -79,19 +75,18 @@@ LOCAL_SRC_FILES := 
  	$(common_src_files)
  
  LOCAL_C_INCLUDES := $(common_c_includes)
 -
  LOCAL_CFLAGS := -Werror=format
+ 
+ ifeq ($(TARGET_HW_DISK_ENCRYPTION),true)
+ LOCAL_C_INCLUDES += $(TARGET_CRYPTFS_HW_PATH)
+ common_shared_libraries += libcryptfs_hw
+ LOCAL_CFLAGS += -DCONFIG_HW_DISK_ENCRYPTION
+ endif
+ 
  LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)
 -
  LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
  
 +LOCAL_CXX_STL := libc++
  include $(BUILD_EXECUTABLE)
  
  include $(CLEAR_VARS)