Skip to content

GitLab

Commit 8bc4f69c authored by Colin Cross's avatar Colin Cross
Browse files

ext4_utils: Convert all build target tags to optional 

A typo in the build target tags was causing them all to be
left blank.  use_e2fsprogs_module_tags is unused now, so
change all targets to optional.

Change-Id: Ie6cf18b8443c9b09b8b9e88fac3569b5527fec64
parent 96713431
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 23 deletions
Android.mk
View file @ 8bc4f69c
ifneq ($(TARGET_SIMULATOR),true)
use_e2fsprogs_module_tags := optional
include $(call all-subdir-makefiles)
endif
e2fsck/Android.mk
View file @ 8bc4f69c
......@@ -48,7 +48,7 @@ LOCAL_C_INCLUDES := $(libext2_profile_c_includes)
LOCAL_CFLAGS := $(libext2_profile_cflags)
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libext2_profile
LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
......@@ -61,7 +61,7 @@ LOCAL_CFLAGS := $(libext2_profile_cflags)
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libext2_profile_host
LOCAL_MODULE_STEM := libext2_profile
LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_SHARED_LIBRARY)
......@@ -144,7 +144,7 @@ LOCAL_CFLAGS := $(e2fsck_cflags)
LOCAL_SYSTEM_SHARED_LIBRARIES := $(e2fsck_system_shared_libraries)
LOCAL_SHARED_LIBRARIES := $(e2fsck_shared_libraries)
LOCAL_MODULE := e2fsck
LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
LOCAL_MODULE_TAGS := optional
include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
......@@ -155,6 +155,6 @@ LOCAL_CFLAGS := $(e2fsck_cflags)
LOCAL_SHARED_LIBRARIES := $(e2fsck_shared_libraries)
LOCAL_MODULE := e2fsck_host
LOCAL_MODULE_STEM := e2fsck
LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_EXECUTABLE)
lib/blkid/Android.mk
View file @ 8bc4f69c
......@@ -57,7 +57,7 @@ LOCAL_C_INCLUDES := $(libext2_blkid_c_includes)
LOCAL_CFLAGS := $(libext2_blkid_cflags) $(libext2_blkid_cflags_linux)
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libext2_blkid
LOCAL_MODULE_TAGS:= $(use_e2fsprog_module_tags)
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
......@@ -74,6 +74,6 @@ endif
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libext2_blkid_host
LOCAL_MODULE_STEM := libext2_blkid
LOCAL_MODULE_TAGS:= $(use_e2fsprog_module_tags)
LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_SHARED_LIBRARY)
lib/e2p/Android.mk
View file @ 8bc4f69c
......@@ -59,7 +59,7 @@ LOCAL_CFLAGS := $(libext2_e2p_cflags)
LOCAL_SYSTEM_SHARED_LIBRARIES := $(libext2_e2p_system_shared_libraries)
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libext2_e2p
LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
......@@ -71,6 +71,6 @@ LOCAL_CFLAGS := $(libext2_e2p_cflags)
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libext2_e2p_host
LOCAL_MODULE_STEM := libext2_e2p
LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_SHARED_LIBRARY)
lib/et/Android.mk
View file @ 8bc4f69c
......@@ -45,7 +45,7 @@ LOCAL_C_INCLUDES := $(libext2_com_err_c_includes)
LOCAL_CFLAGS := $(libext2_com_err_cflags) $(libext2_com_err_cflags_linux)
LOCAL_SYSTEM_SHARED_LIBRARIES := libc
LOCAL_MODULE := libext2_com_err
LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
LOCAL_MODULE_TAGS := optional
LOCAL_PRELINK_MODULE := false
include $(BUILD_SHARED_LIBRARY)
......@@ -61,7 +61,7 @@ LOCAL_CFLAGS := $(libext2_com_err_cflags)
endif
LOCAL_MODULE := libext2_com_err_host
LOCAL_MODULE_STEM := libext2_com_err
LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
LOCAL_MODULE_TAGS := optional
LOCAL_PRELINK_MODULE := false
include $(BUILD_HOST_SHARED_LIBRARY)
lib/ext2fs/Android.mk
View file @ 8bc4f69c
......@@ -109,7 +109,7 @@ LOCAL_C_INCLUDES := $(libext2fs_c_includes)
LOCAL_CFLAGS := $(libext2fs_cflags) $(libext2fs_cflags_linux)
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libext2fs
LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
......@@ -126,6 +126,6 @@ endif
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libext2fs_host
LOCAL_MODULE_STEM := libext2fs
LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_SHARED_LIBRARY)
lib/uuid/Android.mk
View file @ 8bc4f69c
......@@ -50,7 +50,7 @@ LOCAL_C_INCLUDES := $(libext2_uuid_c_includes)
LOCAL_CFLAGS := $(libext2_uuid_cflags)
LOCAL_SYSTEM_SHARED_LIBRARIES := $(libext2_uuid_system_shared_libraries)
LOCAL_MODULE := libext2_uuid
LOCAL_MODULE_TAGS:= $(use_e2fsprog_module_tags)
LOCAL_MODULE_TAGS := optional
LOCAL_PRELINK_MODULE := false
include $(BUILD_SHARED_LIBRARY)
......@@ -62,7 +62,7 @@ LOCAL_C_INCLUDES := $(libext2_uuid_c_includes)
LOCAL_CFLAGS := $(libext2_uuid_cflags)
LOCAL_MODULE := libext2_uuid_host
LOCAL_MODULE_STEM := libext2_uuid
LOCAL_MODULE_TAGS:= $(use_e2fsprog_module_tags)
LOCAL_MODULE_TAGS := optional
LOCAL_PRELINK_MODULE := false
include $(BUILD_HOST_SHARED_LIBRARY)
misc/Android.mk
View file @ 8bc4f69c
......@@ -60,7 +60,7 @@ LOCAL_CFLAGS := $(mke2fs_cflags) $(mke2fs_cflags_linux)
LOCAL_SYSTEM_SHARED_LIBRARIES := $(mke2fs_system_shared_libraries)
LOCAL_SHARED_LIBRARIES := $(mke2fs_shared_libraries)
LOCAL_MODULE := mke2fs
LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
LOCAL_MODULE_TAGS := optional
include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
......@@ -75,7 +75,7 @@ endif
LOCAL_SHARED_LIBRARIES := $(mke2fs_shared_libraries)
LOCAL_MODULE := mke2fs_host
LOCAL_MODULE_STEM := mke2fs
LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_EXECUTABLE)
......@@ -136,7 +136,7 @@ LOCAL_CFLAGS := $(tune2fs_cflags)
LOCAL_SHARED_LIBRARIES := $(tune2fs_shared_libraries)
LOCAL_SYSTEM_SHARED_LIBRARIES := $(tune2fs_system_shared_libraries)
LOCAL_MODULE := tune2fs
LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
LOCAL_MODULE_TAGS := optional
include $(BUILD_EXECUTABLE)
......@@ -148,7 +148,7 @@ LOCAL_CFLAGS := $(tune2fs_cflags)
LOCAL_SHARED_LIBRARIES := $(tune2fs_shared_libraries)
LOCAL_MODULE := tune2fs_host
LOCAL_MODULE_STEM := tune2fs
LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_EXECUTABLE)
......@@ -207,7 +207,7 @@ LOCAL_CFLAGS := $(badblocks_cflags)
LOCAL_SHARED_LIBRARIES := $(badblocks_shared_libraries)
LOCAL_SYSTEM_SHARED_LIBRARIES := $(badblocks_system_shared_libraries)
LOCAL_MODULE := badblocks
LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
LOCAL_MODULE_TAGS := optional
include $(BUILD_EXECUTABLE)
......@@ -219,6 +219,6 @@ LOCAL_CFLAGS := $(badblocks_cflags)
LOCAL_SHARED_LIBRARIES := $(badblocks_shared_libraries)
LOCAL_MODULE := badblocks_host
LOCAL_MODULE_STEM := badblocks
LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_EXECUTABLE)
resize/Android.mk
View file @ 8bc4f69c
......@@ -51,7 +51,7 @@ LOCAL_CFLAGS := $(resize2fs_cflags)
LOCAL_SHARED_LIBRARIES := $(resize2fs_shared_libraries)
LOCAL_SYSTEM_SHARED_LIBRARIES := $(resize2fs_system_shared_libraries)
LOCAL_MODULE := resize2fs
LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
LOCAL_MODULE_TAGS := optional
include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
......@@ -62,6 +62,6 @@ LOCAL_CFLAGS := $(resize2fs_cflags)
LOCAL_SHARED_LIBRARIES := $(resize2fs_shared_libraries)
LOCAL_MODULE := resize2fs_host
LOCAL_MODULE_STEM := resize2fs
LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_EXECUTABLE)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment