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

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

Snap for 11881322 from f0b9f0b6 to 24Q3-release

Change-Id: I6ac3618f6232dd8383e763a4ca44e601dffa3507
parents 5684b1e0 f0b9f0b6
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@
#include <filesystem>
#include <memory>
#include <string>
#include <string_view>
#include <thread>

#include <android-base/chrono_utils.h>
@@ -377,8 +378,8 @@ std::vector<std::string> DeviceHandler::GetBlockDeviceSymlinks(const Uevent& uev

    if (FindPlatformDevice(uevent.path, &device)) {
        // Skip /devices/platform or /devices/ if present
        static const std::string devices_platform_prefix = "/devices/platform/";
        static const std::string devices_prefix = "/devices/";
        static constexpr std::string_view devices_platform_prefix = "/devices/platform/";
        static constexpr std::string_view devices_prefix = "/devices/";

        if (StartsWith(device, devices_platform_prefix)) {
            device = device.substr(devices_platform_prefix.length());
+0 −3
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ cc_library {
    ramdisk_available: true,
    vendor_ramdisk_available: true,
    recovery_available: true,
    vndk: {
        enabled: true,
    },
    host_supported: true,
    srcs: [
        "android_pubkey.cpp",
+1 −4
Original line number Diff line number Diff line
@@ -129,10 +129,7 @@ libcutils_nonwindows_sources = [
cc_library {
    name: "libcutils",
    defaults: ["libcutils_defaults"],
    vndk: {
        enabled: true,
        support_system_process: true,
    },
    double_loadable: true,
    srcs: [
        "config_utils.cpp",
        "iosched_policy.cpp",
+0 −3
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ license {
cc_library_shared {
    name: "libnetutils",
    vendor_available: true,
    vndk: {
        enabled: true,
    },

    srcs: [
        "dhcpclient.c",
+1 −4
Original line number Diff line number Diff line
@@ -72,10 +72,7 @@ cc_library {
    recovery_available: true,
    vendor_available: true,
    product_available: true,
    vndk: {
        enabled: true,
        support_system_process: true,
    },
    double_loadable: true,
    shared_libs: [
        "libbase",
        "libcgrouprc",
Loading