vold3: auto mount CDROM

[android-x86/system-vold.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 1d36312..db39dcc 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -8,8 +8,11 @@ common_src_files := \
        NetlinkManager.cpp \
        NetlinkHandler.cpp \
        Process.cpp \
+       fs/Exfat.cpp \
        fs/Ext4.cpp \
        fs/F2fs.cpp \
+       fs/Iso9660.cpp \
+       fs/Ntfs.cpp \
        fs/Vfat.cpp \
        Loop.cpp \
        Devmapper.cpp \
@@ -19,6 +22,7 @@ common_src_files := \
        VoldUtil.c \
        cryptfs.c \
        Disk.cpp \
+       DiskPartition.cpp \
        VolumeBase.cpp \
        PublicVolume.cpp \
        PrivateVolume.cpp \
@@ -27,6 +31,7 @@ common_src_files := \
        MoveTask.cpp \
        Benchmark.cpp \
        TrimTask.cpp \
+       main.cpp
 
 common_c_includes := \
        system/extras/ext4_utils \
@@ -35,35 +40,53 @@ common_c_includes := \
        frameworks/native/include \
        system/security/keystore \
        hardware/libhardware/include/hardware \
-       system/security/softkeymaster/include/keymaster
+       system/security/softkeymaster/include/keymaster \
+       external/e2fsprogs/lib
 
-common_shared_libraries := \
+common_libraries := \
        libsysutils \
        libbinder \
        libcutils \
        liblog \
        libdiskconfig \
-       libhardware_legacy \
        liblogwrap \
-       libext4_utils \
        libf2fs_sparseblock \
-       libcrypto \
        libselinux \
-       libutils \
+       libutils
+
+common_shared_libraries := \
+       $(common_libraries) \
+       libhardware_legacy \
+       libext4_utils \
+       libcrypto \
        libhardware \
        libsoftkeymaster \
        libbase \
+       libext2_blkid
 
 common_static_libraries := \
        libfs_mgr \
+       libext4_utils_static \
+       libsparse_static \
        libsquashfs_utils \
        libscrypt_static \
        libmincrypt \
-       libbatteryservice
+       libbatteryservice \
+       libext2_blkid \
+       libext2_uuid_static \
+       libz
 
 vold_conlyflags := -std=c11
 vold_cflags := -Werror -Wall -Wno-missing-field-initializers -Wno-unused-variable -Wno-unused-parameter
 
+ifeq ($(TARGET_KERNEL_HAVE_EXFAT),true)
+vold_cflags += -DCONFIG_KERNEL_HAVE_EXFAT
+endif
+
+ifeq ($(TARGET_KERNEL_HAVE_NTFS),true)
+vold_cflags += -DCONFIG_KERNEL_HAVE_NTFS
+endif
+
 include $(CLEAR_VARS)
 
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
@@ -74,9 +97,15 @@ LOCAL_C_INCLUDES := $(common_c_includes)
 LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)
 LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
 LOCAL_MODULE_TAGS := eng tests
-LOCAL_CFLAGS := $(vold_cflags)
+LOCAL_CFLAGS := $(vold_cflags) $(if $(CM_BUILD),-DCM_BUILD)
 LOCAL_CONLYFLAGS := $(vold_conlyflags)
 
+ifeq ($(TARGET_HW_DISK_ENCRYPTION),true)
+TARGET_CRYPTFS_HW_PATH ?= device/qcom/common/cryptfs_hw
+LOCAL_C_INCLUDES += $(TARGET_CRYPTFS_HW_PATH)
+LOCAL_CFLAGS += -DCONFIG_HW_DISK_ENCRYPTION
+endif
+
 include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -85,22 +114,19 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_MODULE:= vold
 LOCAL_CLANG := true
 LOCAL_SRC_FILES := \
-       main.cpp \
-       $(common_src_files)
+       vold.c
 
 LOCAL_C_INCLUDES := $(common_c_includes)
 LOCAL_CFLAGS := $(vold_cflags)
 LOCAL_CONLYFLAGS := $(vold_conlyflags)
 
+LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)
+LOCAL_STATIC_LIBRARIES := libvold $(common_static_libraries)
+
 ifeq ($(TARGET_HW_DISK_ENCRYPTION),true)
-LOCAL_C_INCLUDES += $(TARGET_CRYPTFS_HW_PATH)
-common_shared_libraries += libcryptfs_hw
-LOCAL_CFLAGS += -DCONFIG_HW_DISK_ENCRYPTION
+LOCAL_SHARED_LIBRARIES += libcryptfs_hw
 endif
 
-LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)
-LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
-
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
@@ -126,3 +152,16 @@ LOCAL_CFLAGS := $(vold_cflags)
 LOCAL_CONLYFLAGS := $(vold_conlyflags)
 
 include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+LOCAL_MODULE := libminivold_static
+LOCAL_CLANG := true
+LOCAL_SRC_FILES := $(common_src_files)
+LOCAL_C_INCLUDES := $(common_c_includes) system/core/fs_mgr/include system/core/logwrapper/include
+LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)
+LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
+LOCAL_MODULE_TAGS := eng tests
+LOCAL_CFLAGS := $(vold_cflags) -DMINIVOLD
+LOCAL_CONLYFLAGS := $(vold_conlyflags)
+include $(BUILD_STATIC_LIBRARY)