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

Commit 2756339c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "liblp: Allow building liblp as a shared library."

parents f6b82314 f792e416

fs_mgr/Android.bp

+3 −2
Original line number Original line Diff line number Diff line
@@ -56,20 +56,21 @@ cc_library { 
        "liblog",

        "liblog",

        "libsquashfs_utils",

        "libsquashfs_utils",

        "libselinux",

        "libselinux",

        "liblp",

    ],

    ],

    static_libs: [

    static_libs: [

        "libavb",

        "libavb",

        "libfstab",

        "libfstab",

        "libdm",

        "libdm",

        "liblp",

    ],

    ],

    export_static_lib_headers: [

    export_static_lib_headers: [

        "libfstab",

        "libfstab",

        "libdm",

        "libdm",

    ],

    export_shared_lib_headers: [

        "liblp",

        "liblp",

    ],

    ],

    whole_static_libs: [

    whole_static_libs: [

        "liblp",

        "liblogwrap",

        "liblogwrap",

        "libdm",

        "libdm",

        "libfstab",

        "libfstab",

fs_mgr/liblp/Android.bp

+4 −10
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
// limitations under the License.

// limitations under the License.

//

//





cc_library_static {

cc_library {

    name: "liblp",

    name: "liblp",

    host_supported: true,

    host_supported: true,

    recovery_available: true,

    recovery_available: true,
@@ -29,17 +29,14 @@ cc_library_static { 
        "utility.cpp",

        "utility.cpp",

        "writer.cpp",

        "writer.cpp",

    ],

    ],

    static_libs: [

    shared_libs: [

        "libbase",

        "libbase",

        "liblog",

        "liblog",

        "libcrypto",

        "libcrypto",

        "libcrypto_utils",

        "libcrypto_utils",

        "libsparse",

        "libsparse",

    ],

    whole_static_libs: [

        "libext2_uuid",

        "libext2_uuid",

        "libext4_utils",

        "libext4_utils",

        "libsparse",

        "libz",

        "libz",

    ],

    ],

    export_include_dirs: ["include"],

    export_include_dirs: ["include"],
@@ -51,12 +48,9 @@ cc_test { 
    cppflags: [

    cppflags: [

        "-Wno-unused-parameter",

        "-Wno-unused-parameter",

    ],

    ],

    static_libs: [

    shared_libs: [

        "libbase",

        "liblog",

        "libcrypto",

        "libcrypto_utils",

        "liblp",

        "liblp",

        "libbase",

        "libfs_mgr",

        "libfs_mgr",

    ],

    ],

    srcs: [

    srcs: [

init/Android.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -67,6 +67,7 @@ LOCAL_STATIC_LIBRARIES := \ 
    libprotobuf-cpp-lite \

    libprotobuf-cpp-lite \

    libpropertyinfoserializer \

    libpropertyinfoserializer \

    libpropertyinfoparser \

    libpropertyinfoparser \

    liblp \





shared_libs := \

shared_libs := \

    libcutils \

    libcutils \