Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "libc++fs is part of libc++ now." into main

Browse Source
This commit is contained in:
Elliott Hughes
2024-06-05 13:06:47 +00:00
committed by Gerrit Code Review
parent b70524066f 98eb91c3cb
commit a22a7ccba5
5 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
automotive/can/1.0/default/Android.bp
View File

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

4
automotive/can/1.0/default/CanController.cpp
View File

@@ -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;

1
automotive/can/1.0/default/tests/fuzzer/Android.bp
View File

@@ -43,7 +43,6 @@ cc_fuzz {
],
static_libs: [
"android.hardware.automotive.can@libnetdevice",
"android.hardware.automotive@libc++fs",
"libnl++",
],
fuzz_config: {

1
automotive/can/aidl/default/Android.bp
View File

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

4
automotive/can/aidl/default/CanController.cpp
View File

@@ -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;