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

Commit 8a9bd008 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "snapuserd: Don't statically link outside of ramdisk." into main am:... 

Merge "snapuserd: Don't statically link outside of ramdisk." into main am: 2119b10f am: 35ca9086

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



Change-Id: I907393cd04049336158bef82b7529c1760d3997f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6d45f140 35ca9086

fs_mgr/libsnapshot/snapuserd/Android.bp

+11 −10
Original line number Diff line number Diff line
@@ -145,14 +145,6 @@ cc_defaults { 
    ],



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

    system_shared_libs: [],



    // snapuserd is started during early boot by first-stage init. At that

    // point, /system is mounted using the "dm-user" device-mapper kernel

    // module. dm-user routes all I/O to userspace to be handled by

    // snapuserd, which would lead to deadlock if we had to handle page

    // faults for its code pages.

    static_executable: true,

}



cc_binary {
@@ -165,7 +157,7 @@ cc_binary { 
        "libsnapuserd_client",

    ],

    ramdisk_available: false,

    vendor_ramdisk_available: true,

    vendor_ramdisk_available: false,

}



// This target will install to /system/bin/snapuserd_ramdisk
@@ -184,6 +176,15 @@ cc_binary { 
    vendor_ramdisk_available: false,

    ramdisk: true,

    symlinks: ["snapuserd"],



    system_shared_libs: [],



    // snapuserd is started during early boot by first-stage init. At that

    // point, /system is mounted using the "dm-user" device-mapper kernel

    // module. dm-user routes all I/O to userspace to be handled by

    // snapuserd, which would lead to deadlock if we had to handle page

    // faults for its code pages.

    static_executable: true,

}



cc_defaults {