Remove "_host" and "_static" suffix from libsparse definition.
This now combines all the "libsparse" libraries into the same soong
target. A minor side-effect of this change is that the libsparse
static library depends on the libz shared library instead of the libz
static library. This minor change has no effect since targets using
the static libsparse library need to explicitly include either the
static libz or the shared one.
Bug: 34220783
Change-Id: I8f41586cf4c3336791cfa57ab4f5ae59a76d7ffa
diff --git a/fastboot/Android.mk b/fastboot/Android.mk
index 26333f9..5610cc0 100644
--- a/fastboot/Android.mk
+++ b/fastboot/Android.mk
@@ -58,7 +58,7 @@
LOCAL_STATIC_LIBRARIES := \
libziparchive \
libext4_utils \
- libsparse_host \
+ libsparse \
libutils \
liblog \
libz \
diff --git a/fs_mgr/Android.mk b/fs_mgr/Android.mk
index f929338..44d68a7 100644
--- a/fs_mgr/Android.mk
+++ b/fs_mgr/Android.mk
@@ -52,7 +52,7 @@
libcutils \
liblog \
libc \
- libsparse_static \
+ libsparse \
libz \
libselinux
LOCAL_CXX_STL := libc++_static
diff --git a/init/Android.mk b/init/Android.mk
index 60b37b9..6615692 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -101,7 +101,7 @@
libcrypto \
libc++_static \
libdl \
- libsparse_static \
+ libsparse \
libz \
libprocessgroup \
libnl \
diff --git a/libsparse/Android.bp b/libsparse/Android.bp
index 7a6ae8a..dd8b5fd 100644
--- a/libsparse/Android.bp
+++ b/libsparse/Android.bp
@@ -1,7 +1,9 @@
// Copyright 2010 The Android Open Source Project
-cc_defaults {
- name: "libsparse_defaults",
+cc_library {
+ name: "libsparse",
+ host_supported: true,
+ unique_host_soname: true,
srcs: [
"backed_block.c",
"output_file.c",
@@ -13,32 +15,19 @@
cflags: ["-Werror"],
local_include_dirs: ["include"],
export_include_dirs: ["include"],
-}
-
-cc_library_host_static {
- name: "libsparse_host",
- defaults: ["libsparse_defaults"],
- static_libs: ["libz"],
target: {
+ host: {
+ shared_libs: ["libz-host"],
+ },
+ android: {
+ shared_libs: ["libz"],
+ },
windows: {
enabled: true,
},
},
}
-cc_library_shared {
- name: "libsparse",
- defaults: ["libsparse_defaults"],
- shared_libs: ["libz"],
-}
-
-cc_library_static {
- name: "libsparse_static",
- host_supported: true,
- defaults: ["libsparse_defaults"],
- static_libs: ["libz"],
-}
-
cc_binary {
name: "simg2img",
host_supported: true,
@@ -47,7 +36,7 @@
"sparse_crc32.c",
],
static_libs: [
- "libsparse_static",
+ "libsparse",
"libz",
],
@@ -59,7 +48,7 @@
host_supported: true,
srcs: ["img2simg.c"],
static_libs: [
- "libsparse_static",
+ "libsparse",
"libz",
],
@@ -70,7 +59,7 @@
name: "append2simg",
srcs: ["append2simg.c"],
static_libs: [
- "libsparse_static",
+ "libsparse",
"libz",
],