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

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

Snap for 11931036 from 6aad84d9 to 24Q3-release 

Change-Id: I8cd5c60ae3290e095252e2befc61986879d907a9
parents 9cd47200 6aad84d9

automotive/can/1.0/default/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ cc_binary { 
    ],

    static_libs: [

        "android.hardware.automotive.can@libnetdevice",

        "android.hardware.automotive@libc++fs",

        "libnl++",

    ],

    vintf_fragments: ["manifest_android.hardware.automotive.can@1.0.xml"],

automotive/can/1.0/default/CanBus.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <utils/Mutex.h>



#include <atomic>

#include <mutex>

#include <thread>



namespace android::hardware::automotive::can::V1_0::implementation {

automotive/can/1.0/default/CanController.cpp

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <android-base/logging.h>

#include <android/hidl/manager/1.2/IServiceManager.h>



#include <automotive/filesystem>

#include <filesystem>

#include <fstream>

#include <regex>
@@ -31,7 +31,7 @@ namespace android::hardware::automotive::can::V1_0::implementation { 


using IfId = ICanController::BusConfig::InterfaceId;

using IfIdDisc = ICanController::BusConfig::InterfaceId::hidl_discriminator;

namespace fs = android::hardware::automotive::filesystem;

namespace fs = ::std::filesystem;



namespace fsErrors {

static const std::error_code ok;

automotive/can/1.0/default/tests/fuzzer/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ cc_fuzz { 
    ],

    static_libs: [

        "android.hardware.automotive.can@libnetdevice",

        "android.hardware.automotive@libc++fs",

        "libnl++",

    ],

    fuzz_config: {

automotive/can/aidl/default/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ cc_binary { 
    ],

    static_libs: [

        "android.hardware.automotive.can@libnetdevice",

        "android.hardware.automotive@libc++fs",

        "libnl++",

    ],

    vintf_fragments: ["android.hardware.automotive.can.xml"],