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

Commit 245da012 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge changes from topic "lpdump-snapshots" into main am: f489314d

parents f0c99ee9 f489314d
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ cc_defaults {
    sanitize: {
        misc_undefined: ["integer"],
    },
    local_include_dirs: ["include/"],
    cflags: [
        "-Wall",
        "-Werror",
@@ -60,6 +59,7 @@ cc_defaults {
    name: "libfs_mgr_defaults",
    defaults: ["fs_mgr_defaults"],
    export_include_dirs: ["include"],
    local_include_dirs: ["include/"],
    include_dirs: ["system/vold"],
    cflags: [
        "-D_FILE_OFFSET_BITS=64",
@@ -188,6 +188,7 @@ cc_library_static {
    ],
    host_supported: true,
    defaults: ["fs_mgr_defaults"],
    local_include_dirs: ["include/"],
    srcs: [
        "fs_mgr_fstab.cpp",
        "fs_mgr_boot_config.cpp",
+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ cc_library_static {
    defaults: [
        "fs_mgr_defaults",
    ],
    local_include_dirs: ["include/"],
    srcs: [
        "dm-snapshot-merge/snapuserd.cpp",
        "dm-snapshot-merge/snapuserd_worker.cpp",