Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e0b3229 authored by Alex Deymo's avatar Alex Deymo Committed by Gerrit Code Review
Browse files

Merge changes from topic 'host_suffix_cleanup' 

* changes:
  Remove "_host" and "_static" suffix from libsparse definition.
  Remove "_static" and "_host" suffix from libext4_utils.
parents 6bc1d383 b0c39595

adb/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ LOCAL_STATIC_LIBRARIES := \ 
    libfec_rs \

    libselinux \

    liblog \

    libext4_utils_static \

    libext4_utils \

    libsquashfs_utils \

    libcutils \

    libbase \

fastboot/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ LOCAL_C_INCLUDES_windows := development/host/windows/usb/api 


LOCAL_STATIC_LIBRARIES := \

    libziparchive \

    libext4_utils_host \

    libsparse_host \

    libext4_utils \

    libsparse \

    libutils \

    liblog \

    libz \

fs_mgr/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ common_static_libraries := \ 
    libbase \

    libcrypto_utils \

    libcrypto \

    libext4_utils_static \

    libext4_utils \

    libsquashfs_utils \

    libselinux
@@ -57,7 +57,7 @@ LOCAL_STATIC_LIBRARIES := libfs_mgr \ 
    libcutils \

    liblog \

    libc \

    libsparse_static \

    libsparse \

    libz \

    libselinux

LOCAL_CXX_STL := libc++_static

init/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ LOCAL_STATIC_LIBRARIES := \ 
    libsquashfs_utils \

    liblogwrap \

    libcutils \

    libext4_utils_static \

    libext4_utils \

    libbase \

    libc \

    libselinux \
@@ -101,7 +101,7 @@ LOCAL_STATIC_LIBRARIES := \ 
    libcrypto \

    libc++_static \

    libdl \

    libsparse_static \

    libsparse \

    libz \

    libprocessgroup \

    libnl \

libsparse/Android.bp

+13 −24
Original line number Diff line number Diff line 
// 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 @@ cc_defaults { 
    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 @@ cc_binary { 
        "sparse_crc32.c",

    ],

    static_libs: [

        "libsparse_static",

        "libsparse",

        "libz",

    ],
@@ -59,7 +48,7 @@ cc_binary { 
    host_supported: true,

    srcs: ["img2simg.c"],

    static_libs: [

        "libsparse_static",

        "libsparse",

        "libz",

    ],
@@ -70,7 +59,7 @@ cc_binary_host { 
    name: "append2simg",

    srcs: ["append2simg.c"],

    static_libs: [

        "libsparse_static",

        "libsparse",

        "libz",

    ],