ext4_utils: define keyctl_unlink()

[android-x86/system-extras.git] / ext4_utils / Android.mk

diff --git a/ext4_utils/Android.mk b/ext4_utils/Android.mk
index d9df220..e59eb4a 100644 (file)
--- a/ext4_utils/Android.mk
+++ b/ext4_utils/Android.mk
@@ -2,49 +2,19 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-libext4_utils_src_files := \
-    make_ext4fs.c \
-    ext4fixup.c \
-    ext4_utils.c \
-    allocate.c \
-    contents.c \
-    extent.c \
-    indirect.c \
-    sha1.c \
-    wipe.c \
-    crc16.c \
-    ext4_sb.c
-
 #
 # -- All host/targets including windows
 #
 
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(libext4_utils_src_files)
-LOCAL_MODULE := libext4_utils_host
-# Various instances of dereferencing a type-punned pointer in extent.c
-LOCAL_CFLAGS += -fno-strict-aliasing
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/include
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-    $(LOCAL_PATH)/include
-LOCAL_STATIC_LIBRARIES := \
-    libsparse_host
-LOCAL_STATIC_LIBRARIES_darwin += libselinux
-LOCAL_STATIC_LIBRARIES_linux += libselinux
-LOCAL_MODULE_HOST_OS := darwin linux windows
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-
-include $(CLEAR_VARS)
 LOCAL_SRC_FILES := make_ext4fs_main.c
 LOCAL_MODULE := make_ext4fs
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/include
 LOCAL_SHARED_LIBRARIES += libcutils
 LOCAL_STATIC_LIBRARIES += \
-    libext4_utils_host \
-    libsparse_host \
+    libext4_utils \
+    libsparse \
     libz
 LOCAL_LDLIBS_windows += -lws2_32
 LOCAL_SHARED_LIBRARIES_darwin += libselinux
@@ -66,52 +36,9 @@ include $(BUILD_HOST_EXECUTABLE)
 # -- All host/targets excluding windows
 #
 
-libext4_utils_src_files += \
-    key_control.cpp \
-    ext4_crypt.cpp
-
 ifneq ($(HOST_OS),windows)
 
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(libext4_utils_src_files)
-LOCAL_MODULE := libext4_utils
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/include \
-    system/core/logwrapper/include
-# Various instances of dereferencing a type-punned pointer in extent.c
-LOCAL_CFLAGS += -fno-strict-aliasing
-LOCAL_CFLAGS += -DREAL_UUID
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-    $(LOCAL_PATH)/include
-LOCAL_SHARED_LIBRARIES := \
-    libbase \
-    libcutils \
-    libext2_uuid \
-    libselinux \
-    libsparse
-include $(BUILD_SHARED_LIBRARY)
-
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := \
-    $(libext4_utils_src_files) \
-    ext4_crypt_init_extensions.cpp
-LOCAL_MODULE := libext4_utils_static
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/include
-# Various instances of dereferencing a type-punned pointer in extent.c
-LOCAL_CFLAGS += -fno-strict-aliasing
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-    $(LOCAL_PATH)/include
-LOCAL_STATIC_LIBRARIES := \
-    liblogwrap \
-    libsparse_static \
-    libselinux \
-    libbase
-include $(BUILD_STATIC_LIBRARY)
-
-
-include $(CLEAR_VARS)
 LOCAL_SRC_FILES := make_ext4fs_main.c
 LOCAL_MODULE := make_ext4fs
 LOCAL_C_INCLUDES := \
@@ -127,33 +54,6 @@ include $(BUILD_EXECUTABLE)
 
 
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := ext2simg.c
-LOCAL_MODULE := ext2simg
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/include
-LOCAL_SHARED_LIBRARIES += \
-    libext4_utils \
-    libselinux \
-    libsparse \
-    libz
-include $(BUILD_EXECUTABLE)
-
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := ext2simg.c
-LOCAL_MODULE := ext2simg
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/include
-LOCAL_SHARED_LIBRARIES += \
-    libselinux
-LOCAL_STATIC_LIBRARIES += \
-    libext4_utils_host \
-    libsparse_host \
-    libz
-include $(BUILD_HOST_EXECUTABLE)
-
-
-include $(CLEAR_VARS)
 LOCAL_SRC_FILES := setup_fs.c
 LOCAL_MODULE := setup_fs
 LOCAL_SHARED_LIBRARIES += libcutils
@@ -174,8 +74,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := ext4fixup_main.c
 LOCAL_MODULE := ext4fixup
 LOCAL_STATIC_LIBRARIES += \
-    libext4_utils_host \
-    libsparse_host \
+    libext4_utils \
+    libsparse \
     libz
 include $(BUILD_HOST_EXECUTABLE)
 
@@ -190,4 +90,16 @@ LOCAL_BUILT_MODULE_STEM := $(notdir $(LOCAL_SRC_FILES))
 LOCAL_IS_HOST_MODULE := true
 include $(BUILD_PREBUILT)
 
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := mkuserimg_mke2fs.sh
+LOCAL_SRC_FILES := mkuserimg_mke2fs.sh
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_REQUIRED_MODULES := mke2fs e2fsdroid
+# We don't need any additional suffix.
+LOCAL_MODULE_SUFFIX :=
+LOCAL_BUILT_MODULE_STEM := $(notdir $(LOCAL_SRC_FILES))
+LOCAL_IS_HOST_MODULE := true
+include $(BUILD_PREBUILT)
+
 endif