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

Commit c9fa93f4 authored by David Anderson's avatar David Anderson
Browse files

snapuserd: Don't statically link outside of ramdisk. 

Also, remove snapuserd from the vendor ramdisk since this isn't used
anymore.

Bug: 345158294
Test: ldd snapuserd_ramdisk and system/bin/snapuserd
      apply full OTA on aosp_cf
Change-Id: I2c2ad1458d67a8449c548e22660f523ba9c86849
parent 283b2037

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 {