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

Commit 98eb91c3 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

libc++fs is part of libc++ now. 

Change-Id: I55a7c77ec09b21375bd3e3187a12383dde7414b0
parent cbe01d23

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/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"],

automotive/can/aidl/default/CanController.cpp

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

#include <android-base/logging.h>



#include <automotive/filesystem>

#include <filesystem>

#include <fstream>

#include <regex>



namespace aidl::android::hardware::automotive::can {



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

namespace fs = ::std::filesystem;



namespace fsErrors {

static const std::error_code ok;