Remove "_host" suffix from libsquashfs_utils.

Bug: 34220783

Change-Id: I9a140ed7bafdb8342dbdc2c7143a765acb86ecb9

diff --git a/libfec/Android.mk b/libfec/Android.mk
index 5399bb7..da60fcc 100644 (file)
--- a/libfec/Android.mk
+++ b/libfec/Android.mk
@@ -18,6 +18,7 @@ common_src_files := \
 common_static_libraries := \
     libext4_utils \
     libfec_rs \
+    libsquashfs_utils \
     libcrypto_utils \
     libcrypto \
     libcutils \
@@ -31,10 +32,7 @@ LOCAL_SANITIZE := integer
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 LOCAL_MODULE := libfec
 LOCAL_SRC_FILES := $(common_src_files)
-LOCAL_STATIC_LIBRARIES := \
-    libsquashfs_utils \
-    libcutils \
-    $(common_static_libraries)
+LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
 include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -47,9 +45,7 @@ endif
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 LOCAL_MODULE := libfec
 LOCAL_SRC_FILES := $(common_src_files)
-LOCAL_STATIC_LIBRARIES := \
-    libsquashfs_utils_host \
-    $(common_static_libraries)
+LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 include $(LOCAL_PATH)/test/Android.mk

diff --git a/libfec/test/Android.mk b/libfec/test/Android.mk
index 4abe6f6..56a6978 100644 (file)
--- a/libfec/test/Android.mk
+++ b/libfec/test/Android.mk
@@ -14,7 +14,7 @@ LOCAL_STATIC_LIBRARIES := \
     libcrypto_utils \
     libcrypto \
     libext4_utils \
-    libsquashfs_utils_host \
+    libsquashfs_utils \
     libbase
 LOCAL_CFLAGS := -Wall -Werror -D_GNU_SOURCE
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/squashfs_utils/Android.mk b/squashfs_utils/Android.mk
index d6f8edd..b7dbcd5 100644 (file)
--- a/squashfs_utils/Android.mk
+++ b/squashfs_utils/Android.mk
@@ -14,7 +14,7 @@ LOCAL_SRC_FILES := squashfs_utils.c
 LOCAL_STATIC_LIBRARIES := libcutils
 LOCAL_C_INCLUDES := external/squashfs-tools/squashfs-tools
 LOCAL_CFLAGS := -Wall -Werror -D_GNU_SOURCE -DSQUASHFS_NO_KLOG
-LOCAL_MODULE := libsquashfs_utils_host
+LOCAL_MODULE := libsquashfs_utils
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)

diff --git a/verity/Android.mk b/verity/Android.mk
index ddea3e2..c2ebd0f 100644 (file)
--- a/verity/Android.mk
+++ b/verity/Android.mk
@@ -52,7 +52,7 @@ LOCAL_STATIC_LIBRARIES := \
     libcrypto \
     libext4_utils \
     libsparse \
-    libsquashfs_utils_host \
+    libsquashfs_utils \
     libbase \
     libz
 LOCAL_CFLAGS := -Wall -Werror

diff --git a/verity/fec/Android.mk b/verity/fec/Android.mk
index e5cd499..8a35a7e 100644 (file)
--- a/verity/fec/Android.mk
+++ b/verity/fec/Android.mk
@@ -16,7 +16,7 @@ LOCAL_STATIC_LIBRARIES := \
     libfec \
     libfec_rs \
     libext4_utils \
-    libsquashfs_utils_host
+    libsquashfs_utils
 LOCAL_SHARED_LIBRARIES := libbase
 LOCAL_CFLAGS += -Wall -Werror -O3
 LOCAL_C_INCLUDES += external/fec