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

Commit 37d59481 authored by Ryan Prichard's avatar Ryan Prichard Committed by Gerrit Code Review
Browse files

Merge "Use std::filesystem when libc++ is new enough" into main

parents 697e3f89 680fd806

automotive/can/1.0/default/libc++fs/include/automotive/filesystem

+14 −0
Original line number Diff line number Diff line
@@ -9,6 +9,18 @@ 
//===----------------------------------------------------------------------===//

#ifndef _LIBAUTO_FILESYSTEM

#define _LIBAUTO_FILESYSTEM



// TODO(152067309): Remove this once the libc++ upgrade is complete.

#include <__config>

#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION > 8000



#include <filesystem>

namespace android::hardware::automotive {

namespace filesystem = std::filesystem;

}



#else



/*

    filesystem synopsis
@@ -2696,4 +2708,6 @@ end(const recursive_directory_iterator&) noexcept { 


_LIBCPP_POP_MACROS



#endif  // defined(_LIBCPP_VERSION) && _LIBCPP_VERSION > 8000



#endif // _LIBAUTO_FILESYSTEM

automotive/can/1.0/default/libc++fs/src/filesystem/directory_iterator.cpp

+8 −0
Original line number Diff line number Diff line
@@ -6,9 +6,15 @@ 
// Source Licenses. See LICENSE.TXT for details.

//

//===----------------------------------------------------------------------===//



// TODO(152067309): Remove this once the libc++ upgrade is complete.

#include <__config>

#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION <= 8000



/* clang-format off */

#include "automotive/filesystem"

#include <__config>



#if defined(_LIBCPP_WIN32API)

#define WIN32_LEAN_AND_MEAN

#include <Windows.h>
@@ -395,3 +401,5 @@ bool recursive_directory_iterator::__try_recursion(error_code* ec) { 


}  // namespace android::hardware::automotive::filesystem

/* clang-format on */



#endif // defined(_LIBCPP_VERSION) && _LIBCPP_VERSION <= 8000

automotive/can/1.0/default/libc++fs/src/filesystem/operations.cpp

+7 −0
Original line number Diff line number Diff line
@@ -6,6 +6,11 @@ 
// Source Licenses. See LICENSE.TXT for details.

//

//===----------------------------------------------------------------------===//



// TODO(152067309): Remove this once the libc++ upgrade is complete.

#include <__config>

#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION <= 8000



/* clang-format off */

#include "automotive/filesystem"

#include <array>
@@ -1771,3 +1776,5 @@ error_code directory_entry::__do_refresh() noexcept { 
#endif

}  // namespace android::hardware::automotive::filesystem

/* clang-format on */



#endif // defined(_LIBCPP_VERSION) && _LIBCPP_VERSION <= 8000