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

Commit babf3a98 authored by David Anderson's avatar David Anderson Committed by Gerrit Code Review
Browse files

Merge changes from topic "libsnapuserd_client" into main 

* changes:
  snapuserd: Remove dependence on libfs_mgr.
  snapuserd: Rename libsnapshot_snapuserd to libsnapuserd_client.
parents 656e2817 c132bf80

fs_mgr/Android.bp

+19 −0
Original line number Diff line number Diff line
@@ -171,6 +171,25 @@ cc_library { 
    ],

}



cc_library_static {

    name: "libfs_mgr_file_wait",

    defaults: ["fs_mgr_defaults"],

    export_include_dirs: ["include"],

    cflags: [

        "-D_FILE_OFFSET_BITS=64",

    ],

    srcs: [

        "file_wait.cpp",

    ],

    shared_libs: [

        "libbase",

    ],

    host_supported: true,

    ramdisk_available: true,

    vendor_ramdisk_available: true,

    recovery_available: true,

}



cc_binary {

    name: "remount",

    defaults: ["fs_mgr_defaults"],

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

+17 −10
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,15 +33,15 @@ 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: [

        "libcutils_sockets",

        "libfs_mgr",

        "libfs_mgr_file_wait",

    ],

    shared_libs: [

        "libbase",
@@ -75,11 +75,13 @@ cc_library_static { 
    static_libs: [

        "libbase",

        "libdm",

        "libext2_uuid",

        "libext4_utils",

        "libsnapshot_cow",

        "liburing",

    ],

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

    export_include_dirs: ["include"],

    header_libs: [

        "libstorage_literals_headers",

    ],
@@ -104,12 +106,13 @@ cc_defaults { 
        "libbrotli",

        "libcutils_sockets",

        "libdm",

        "libfs_mgr",

        "libext2_uuid",

        "libfs_mgr_file_wait",

        "libgflags",

        "liblog",

        "libsnapshot_cow",

        "libsnapshot_snapuserd",

        "libsnapuserd",

        "libsnapuserd_client",

        "libz",

        "liblz4",

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

        "snapuserd.rc",

    ],

    static_libs: [

        "libsnapuserd_client",

    ],

    ramdisk_available: false,

    vendor_ramdisk_available: true,

}
@@ -186,12 +192,13 @@ cc_test { 
        "libbrotli",

        "libgtest",

        "libsnapshot_cow",

        "libsnapshot_snapuserd",

        "libsnapuserd_client",

        "libcutils_sockets",

        "libz",

        "libfs_mgr",

        "libdm",

        "libext2_uuid",

        "libext4_utils",

        "libfs_mgr_file_wait",

    ],

    header_libs: [

        "libstorage_literals_headers",
@@ -221,12 +228,12 @@ cc_test { 
        "libbrotli",

        "libcutils_sockets",

        "libdm",

        "libext2_uuid",

        "libext4_utils",

        "libfs_mgr",

        "libfs_mgr_file_wait",

        "libgflags",

        "libgtest",

        "libsnapshot_cow",

        "libsnapshot_snapuserd",

        "libsnapuserd",

        "liburing",

        "libz",