Remove "_static" and "_host" suffix from libext4_utils definitions.

Bug: 34220783
Change-Id: Ia8da0c96a0384826afd8b089101468ac388d0ca2

diff --git a/ext4_utils/Android.mk b/ext4_utils/Android.mk
index 6a5e75b..fba8ab4 100644 (file)
--- a/ext4_utils/Android.mk
+++ b/ext4_utils/Android.mk
@@ -21,7 +21,7 @@ libext4_utils_src_files := \
 
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(libext4_utils_src_files)
-LOCAL_MODULE := libext4_utils_host
+LOCAL_MODULE := libext4_utils
 # Various instances of dereferencing a type-punned pointer in extent.c
 LOCAL_CFLAGS += -fno-strict-aliasing
 LOCAL_C_INCLUDES := \
@@ -43,7 +43,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/include
 LOCAL_SHARED_LIBRARIES += libcutils
 LOCAL_STATIC_LIBRARIES += \
-    libext4_utils_host \
+    libext4_utils \
     libsparse_host \
     libz
 LOCAL_LDLIBS_windows += -lws2_32
@@ -96,7 +96,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := \
     $(libext4_utils_src_files) \
     ext4_crypt_init_extensions.cpp
-LOCAL_MODULE := libext4_utils_static
+LOCAL_MODULE := libext4_utils
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/include
 # Various instances of dereferencing a type-punned pointer in extent.c
@@ -147,7 +147,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := ext4fixup_main.c
 LOCAL_MODULE := ext4fixup
 LOCAL_STATIC_LIBRARIES += \
-    libext4_utils_host \
+    libext4_utils \
     libsparse_host \
     libz
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/libfec/Android.mk b/libfec/Android.mk
index d37dcbf..5399bb7 100644 (file)
--- a/libfec/Android.mk
+++ b/libfec/Android.mk
@@ -16,6 +16,7 @@ common_src_files := \
     fec_process.cpp
 
 common_static_libraries := \
+    libext4_utils \
     libfec_rs \
     libcrypto_utils \
     libcrypto \
@@ -31,7 +32,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 LOCAL_MODULE := libfec
 LOCAL_SRC_FILES := $(common_src_files)
 LOCAL_STATIC_LIBRARIES := \
-    libext4_utils_static \
     libsquashfs_utils \
     libcutils \
     $(common_static_libraries)
@@ -48,7 +48,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 LOCAL_MODULE := libfec
 LOCAL_SRC_FILES := $(common_src_files)
 LOCAL_STATIC_LIBRARIES := \
-    libext4_utils_host \
     libsquashfs_utils_host \
     $(common_static_libraries)
 include $(BUILD_HOST_STATIC_LIBRARY)

diff --git a/libfec/test/Android.mk b/libfec/test/Android.mk
index e76737f..4abe6f6 100644 (file)
--- a/libfec/test/Android.mk
+++ b/libfec/test/Android.mk
@@ -13,7 +13,7 @@ LOCAL_STATIC_LIBRARIES := \
     libfec_rs \
     libcrypto_utils \
     libcrypto \
-    libext4_utils_host \
+    libext4_utils \
     libsquashfs_utils_host \
     libbase
 LOCAL_CFLAGS := -Wall -Werror -D_GNU_SOURCE

diff --git a/verity/Android.mk b/verity/Android.mk
index 5810eac..a2e5db6 100644 (file)
--- a/verity/Android.mk
+++ b/verity/Android.mk
@@ -50,7 +50,7 @@ LOCAL_STATIC_LIBRARIES := \
     libfec_rs \
     libcrypto_utils \
     libcrypto \
-    libext4_utils_host \
+    libext4_utils \
     libsparse_host \
     libsquashfs_utils_host \
     libbase \

diff --git a/verity/fec/Android.mk b/verity/fec/Android.mk
index b3a4a99..ef4ad85 100644 (file)
--- a/verity/fec/Android.mk
+++ b/verity/fec/Android.mk
@@ -15,7 +15,7 @@ LOCAL_STATIC_LIBRARIES := \
     libcrypto \
     libfec \
     libfec_rs \
-    libext4_utils_host \
+    libext4_utils \
     libsquashfs_utils_host
 LOCAL_SHARED_LIBRARIES := libbase
 LOCAL_CFLAGS += -Wall -Werror -O3