diff options
author | Colin Cross <ccross@android.com> | 2011-01-28 20:19:45 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2011-01-28 20:22:05 -0800 |
commit | 8bc4f69c082b6202f4ad25df0819dd2c61b84292 (patch) | |
tree | e496042a851d09b187e2a1ed754e60fc16340c39 | |
parent | 96713431bbeb5270b545b160da1e3f6167835d0b (diff) | |
download | e2fsprogs-8bc4f69c082b6202f4ad25df0819dd2c61b84292.tar.gz |
ext4_utils: Convert all build target tags to optionalandroid-sdk-tools_r12android-sdk-adt_r12android-sdk-3.1_r1android-sdk-3.0_r1android-3.2_r1android-3.2.4_r1android-3.2.2_r2android-3.2.2_r1android-3.2.1_r2android-3.2.1_r1android-3.1_r1android-3.0_r1.3android-3.0_r1.2android-3.0_r1.1android-3.0_r1
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
-rw-r--r-- | Android.mk | 1 | ||||
-rw-r--r-- | e2fsck/Android.mk | 8 | ||||
-rw-r--r-- | lib/blkid/Android.mk | 4 | ||||
-rw-r--r-- | lib/e2p/Android.mk | 4 | ||||
-rw-r--r-- | lib/et/Android.mk | 4 | ||||
-rw-r--r-- | lib/ext2fs/Android.mk | 4 | ||||
-rw-r--r-- | lib/uuid/Android.mk | 4 | ||||
-rw-r--r-- | misc/Android.mk | 12 | ||||
-rw-r--r-- | resize/Android.mk | 4 |
9 files changed, 22 insertions, 23 deletions
@@ -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 bb98cf64..39a9d258 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 87af46a5..4cbd4e25 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 79a29e61..e8b0211e 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 a7da0e79..8e442f08 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 2de0ac60..6ce9f989 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 b7d2f673..77015149 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 743f6bbf..8c5a21a8 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 b9b4f672..41d90e5c 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) |