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

Commit 45798edb authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

snapuserd: Rename libsnapshot_snapuserd to libsnapuserd_client. am: 75c5deed 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2647521



Change-Id: I917ad3980532ea488c6bcbe9f0af8f9726a4dc96
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 20795138 75c5deed

fs_mgr/libfiemap/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ cc_library_headers { 
    vendor_ramdisk_available: true,

    recovery_available: true,

    export_include_dirs: ["include"],

    host_supported: true,

}



filegroup {

fs_mgr/libsnapshot/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ cc_defaults { 
        "libext2_uuid",

        "libext4_utils",

        "libfstab",

        "libsnapshot_snapuserd",

        "libsnapuserd_client",

        "libz",

    ],

    header_libs: [

fs_mgr/libsnapshot/snapuserd/Android.bp

+9 −6
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package { 
}



cc_defaults {

    name: "libsnapshot_snapuserd_defaults",

    name: "libsnapuserd_client_defaults",

    defaults: [

        "fs_mgr_defaults",

    ],
@@ -33,10 +33,10 @@ cc_defaults { 
}



cc_library_static {

    name: "libsnapshot_snapuserd",

    name: "libsnapuserd_client",

    defaults: [

        "fs_mgr_defaults",

        "libsnapshot_snapuserd_defaults",

        "libsnapuserd_client_defaults",

    ],

    recovery_available: true,

    static_libs: [
@@ -80,6 +80,7 @@ cc_library_static { 
        "liburing",

    ],

    include_dirs: ["bionic/libc/kernel"],

    export_include_dirs: ["include"],

    header_libs: [

        "libstorage_literals_headers",

    ],
@@ -108,8 +109,8 @@ cc_defaults { 
        "libgflags",

        "liblog",

        "libsnapshot_cow",

        "libsnapshot_snapuserd",

        "libsnapuserd",

        "libsnapuserd_client",

        "libz",

        "liblz4",

        "libext4_utils",
@@ -144,6 +145,9 @@ cc_binary { 
    init_rc: [

        "snapuserd.rc",

    ],

    static_libs: [

        "libsnapuserd_client",

    ],

    ramdisk_available: false,

    vendor_ramdisk_available: true,

}
@@ -186,7 +190,7 @@ cc_test { 
        "libbrotli",

        "libgtest",

        "libsnapshot_cow",

        "libsnapshot_snapuserd",

        "libsnapuserd_client",

        "libcutils_sockets",

        "libz",

        "libfs_mgr",
@@ -226,7 +230,6 @@ cc_test { 
        "libgflags",

        "libgtest",

        "libsnapshot_cow",

        "libsnapshot_snapuserd",

        "libsnapuserd",

        "liburing",

        "libz",