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

Commit c8d22b24 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11973804 from fa57c11e to 24Q3-release 

Change-Id: Iad5d64933596101a7d98b44d6c945ab6a9980935
parents f9c9ad81 fa57c11e

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 {

init/apex_init_util.cpp

+3 −2
Original line number Diff line number Diff line
@@ -107,8 +107,9 @@ static Result<void> ParseRcScripts(const std::vector<std::string>& files) { 
    }

    // APEXes can have versioned RC files. These should be filtered based on

    // SDK version.

    auto filtered = FilterVersionedConfigs(

            files, android::base::GetIntProperty("ro.build.version.sdk", INT_MAX));

    int sdk = android::base::GetIntProperty("ro.build.version.sdk", INT_MAX);

    if (sdk < 35) sdk = 35;  // aosp/main merges only into sdk=35+ (ie. __ANDROID_API_V__+)

    auto filtered = FilterVersionedConfigs(files, sdk);

    if (filtered.empty()) {

        return {};

    }