From 205593f65b2f78c2cc8116a7827c241ebc8387fc Mon Sep 17 00:00:00 2001 From: Alex Deymo Date: Wed, 9 Dec 2015 18:15:25 -0800 Subject: [PATCH] Android.mk: Replace _host suffix with more standard -host suffix Most libraries use the "-host" suffix when building for the host. This patch renames all the libraries to use -host instead of _host. Addresses-Google-Bug: #24619596 TEST=make dist Signed-off-by: Theodore Ts'o --- contrib/Android.mk | 2 +- debugfs/Android.mk | 2 +- e2fsck/Android.mk | 2 +- lib/blkid/Android.mk | 2 +- lib/ext2fs/Android.mk | 2 +- lib/ss/Android.mk | 2 +- lib/support/Android.mk | 2 +- misc/Android.mk | 14 +++++++------- resize/Android.mk | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/contrib/Android.mk b/contrib/Android.mk index 66281457..282d47e1 100644 --- a/contrib/Android.mk +++ b/contrib/Android.mk @@ -70,7 +70,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(add_ext4_encrypt_src_files) LOCAL_C_INCLUDES := $(add_ext4_encrypt_c_includes) LOCAL_CFLAGS := $(add_ext4_encrypt_cflags) -LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(add_ext4_encrypt_shared_libraries)) +LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(add_ext4_encrypt_shared_libraries)) LOCAL_MODULE := add_ext4_encrypt_host LOCAL_MODULE_STEM := add_ext4_encrypt LOCAL_MODULE_TAGS := optional diff --git a/debugfs/Android.mk b/debugfs/Android.mk index 22005093..91dc8c32 100644 --- a/debugfs/Android.mk +++ b/debugfs/Android.mk @@ -85,7 +85,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(debugfs_src_files) LOCAL_C_INCLUDES := $(debugfs_c_includes) LOCAL_CFLAGS := $(debugfs_cflags) -LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(debugfs_shared_libraries)) +LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(debugfs_shared_libraries)) LOCAL_MODULE := debugfs_host LOCAL_MODULE_STEM := debugfs LOCAL_MODULE_TAGS := optional diff --git a/e2fsck/Android.mk b/e2fsck/Android.mk index 6a1b604b..604eaa18 100644 --- a/e2fsck/Android.mk +++ b/e2fsck/Android.mk @@ -84,7 +84,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(e2fsck_src_files) LOCAL_C_INCLUDES := $(e2fsck_c_includes) LOCAL_CFLAGS := $(e2fsck_cflags) -LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(e2fsck_shared_libraries)) +LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(e2fsck_shared_libraries)) LOCAL_MODULE := e2fsck_host LOCAL_MODULE_STEM := e2fsck LOCAL_MODULE_TAGS := optional diff --git a/lib/blkid/Android.mk b/lib/blkid/Android.mk index 3f6cdc21..66021f1f 100644 --- a/lib/blkid/Android.mk +++ b/lib/blkid/Android.mk @@ -53,7 +53,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(libext2_blkid_src_files) -LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2_blkid_shared_libraries)) +LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(libext2_blkid_shared_libraries)) LOCAL_C_INCLUDES := $(libext2_blkid_c_includes) LOCAL_CFLAGS := $(libext2_blkid_cflags) LOCAL_MODULE := libext2_blkid_host diff --git a/lib/ext2fs/Android.mk b/lib/ext2fs/Android.mk index 6d9e0418..14d3034d 100644 --- a/lib/ext2fs/Android.mk +++ b/lib/ext2fs/Android.mk @@ -132,7 +132,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(libext2fs_src_files) -LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2fs_shared_libraries)) +LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(libext2fs_shared_libraries)) LOCAL_C_INCLUDES := $(libext2fs_c_includes) LOCAL_EXPORT_C_INCLUDE_DIRS := $(libext2fs_c_includes) LOCAL_CFLAGS := $(libext2fs_cflags) diff --git a/lib/ss/Android.mk b/lib/ss/Android.mk index 91ad1ec0..e87dd9e7 100644 --- a/lib/ss/Android.mk +++ b/lib/ss/Android.mk @@ -51,7 +51,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(libext2_ss_src_files) -LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2_ss_shared_libraries)) +LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(libext2_ss_shared_libraries)) LOCAL_C_INCLUDES := $(libext2_ss_c_includes) LOCAL_CFLAGS := $(libext2_ss_cflags) LOCAL_MODULE := libext2_ss_host diff --git a/lib/support/Android.mk b/lib/support/Android.mk index 1bd0814e..92b665d0 100644 --- a/lib/support/Android.mk +++ b/lib/support/Android.mk @@ -51,6 +51,6 @@ LOCAL_C_INCLUDES := $(libext2_quota_c_includes) LOCAL_CFLAGS := $(libext2_quota_cflags) LOCAL_MODULE := libext2_quota_host LOCAL_MODULE_TAGS := optional -LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2_quota_shared_libraries)) +LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(libext2_quota_shared_libraries)) include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/misc/Android.mk b/misc/Android.mk index 19344ff0..d7a2ee10 100644 --- a/misc/Android.mk +++ b/misc/Android.mk @@ -40,7 +40,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(mke2fs_src_files) LOCAL_C_INCLUDES := $(mke2fs_c_includes) LOCAL_CFLAGS := $(mke2fs_cflags) -LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(mke2fs_shared_libraries)) +LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(mke2fs_shared_libraries)) LOCAL_MODULE := mke2fs_host LOCAL_MODULE_STEM := mke2fs LOCAL_MODULE_TAGS := optional @@ -120,7 +120,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(tune2fs_src_files) LOCAL_C_INCLUDES := $(tune2fs_c_includes) LOCAL_CFLAGS := $(tune2fs_cflags) -LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(tune2fs_shared_libraries)) +LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(tune2fs_shared_libraries)) LOCAL_MODULE := tune2fs_host LOCAL_MODULE_STEM := tune2fs LOCAL_MODULE_TAGS := optional @@ -165,7 +165,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(badblocks_src_files) LOCAL_C_INCLUDES := $(badblocks_c_includes) LOCAL_CFLAGS := $(badblocks_cflags) -LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(badblocks_shared_libraries)) +LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(badblocks_shared_libraries)) LOCAL_MODULE := badblocks_host LOCAL_MODULE_STEM := badblocks LOCAL_MODULE_TAGS := optional @@ -208,7 +208,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(chattr_src_files) LOCAL_C_INCLUDES := $(chattr_c_includes) LOCAL_CFLAGS := $(chattr_cflags) -LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(chattr_shared_libraries)) +LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(chattr_shared_libraries)) LOCAL_MODULE := chattr_host LOCAL_MODULE_STEM := chattr LOCAL_MODULE_TAGS := optional @@ -269,7 +269,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(lsattr_src_files) LOCAL_C_INCLUDES := $(lsattr_c_includes) LOCAL_CFLAGS := $(lsattr_cflags) -LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(lsattr_shared_libraries)) +LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(lsattr_shared_libraries)) LOCAL_MODULE := lsattr_host LOCAL_MODULE_STEM := lsattr LOCAL_MODULE_TAGS := optional @@ -337,7 +337,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(e4crypt_src_files) LOCAL_C_INCLUDES := $(e4crypt_c_includes) LOCAL_CFLAGS := $(e4crypt_cflags) -LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(e4crypt_shared_libraries)) +LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(e4crypt_shared_libraries)) LOCAL_MODULE := e4crypt_host LOCAL_MODULE_STEM := e4crypt LOCAL_MODULE_TAGS := optional @@ -380,7 +380,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(e2image_src_files) LOCAL_C_INCLUDES := $(e2image_c_includes) LOCAL_CFLAGS := $(e2image_cflags) -LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(e2image_shared_libraries)) +LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(e2image_shared_libraries)) LOCAL_MODULE := e2image_host LOCAL_MODULE_STEM := e2image LOCAL_MODULE_TAGS := optional diff --git a/resize/Android.mk b/resize/Android.mk index 1cbd01e5..12d6ab57 100644 --- a/resize/Android.mk +++ b/resize/Android.mk @@ -37,7 +37,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(resize2fs_src_files) LOCAL_C_INCLUDES := $(resize2fs_c_includes) LOCAL_CFLAGS := $(resize2fs_cflags) -LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(resize2fs_shared_libraries)) +LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(resize2fs_shared_libraries)) LOCAL_MODULE := resize2fs_host LOCAL_MODULE_STEM := resize2fs LOCAL_MODULE_TAGS := optional