diff --git a/Android.mk b/Android.mk index ba2c72828c059ada1b613532072596bc413c517e..ba187a6d13f343f8767a59173c6b88cba1742360 100644 --- a/Android.mk +++ b/Android.mk @@ -1,4 +1,3 @@ ifneq ($(TARGET_SIMULATOR),true) -use_e2fsprogs_module_tags := optional include $(call all-subdir-makefiles) endif diff --git a/e2fsck/Android.mk b/e2fsck/Android.mk index bb98cf6435ebfa341839f66c750594157e0dd3e9..39a9d258b4f5c4f2440e254c2ef96c064a914ea7 100644 --- a/e2fsck/Android.mk +++ b/e2fsck/Android.mk @@ -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) diff --git a/lib/blkid/Android.mk b/lib/blkid/Android.mk index 87af46a557a18ae7b73fe05b06bc84c6ad332953..4cbd4e25fd828323f8e85c91ea3cc180ec35a5b6 100644 --- a/lib/blkid/Android.mk +++ b/lib/blkid/Android.mk @@ -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) diff --git a/lib/e2p/Android.mk b/lib/e2p/Android.mk index 79a29e61bc4e4d96208037d98b016bc6518e8cd8..e8b0211ec7c7e088447fe4e025ffac1ed512af93 100644 --- a/lib/e2p/Android.mk +++ b/lib/e2p/Android.mk @@ -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) diff --git a/lib/et/Android.mk b/lib/et/Android.mk index a7da0e79bc00c187d39af563135167126b6b8b40..8e442f08b4eb33087bed6c29ef8dbde58ff78c21 100644 --- a/lib/et/Android.mk +++ b/lib/et/Android.mk @@ -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) diff --git a/lib/ext2fs/Android.mk b/lib/ext2fs/Android.mk index 2de0ac607542922393ce63c4996dffbd52db6ae2..6ce9f9893d926b35e5a318a817defa6b35b14528 100644 --- a/lib/ext2fs/Android.mk +++ b/lib/ext2fs/Android.mk @@ -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) diff --git a/lib/uuid/Android.mk b/lib/uuid/Android.mk index b7d2f67354c604c87966a3be28da4251e88e2dce..770151492b04c810ee3cf11df2949238a4aa5cc8 100644 --- a/lib/uuid/Android.mk +++ b/lib/uuid/Android.mk @@ -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) diff --git a/misc/Android.mk b/misc/Android.mk index 743f6bbf5fdb3f665daa89bda6e0f49e68e30f3b..8c5a21a81b125d855ecc76d87474d8a0dcb36e76 100644 --- a/misc/Android.mk +++ b/misc/Android.mk @@ -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) diff --git a/resize/Android.mk b/resize/Android.mk index b9b4f672d693debb787083e6ed823f2430b87079..41d90e5c2b03f8e62451db79947ddb1e544ca042 100644 --- a/resize/Android.mk +++ b/resize/Android.mk @@ -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)