Skip to content

[android] fix path and cmake local build target tracking for posix_fi… #75494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 29, 2024
Merged

[android] fix path and cmake local build target tracking for posix_fi… #75494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions lib/ClangImporter/ClangIncludePaths.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,29 +418,6 @@ GetPlatformAuxiliaryFile(StringRef Platform, StringRef File,
return "";
}

SmallVector<std::pair<std::string, std::string>, 2>
GetAndroidFileMappings(
ASTContext &Context, const std::string &sysroot,
const llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> &VFS) {
const llvm::Triple &Triple = Context.LangOpts.Target;
const SearchPathOptions &SearchPathOpts = Context.SearchPathOpts;
SmallVector<std::pair<std::string, std::string>, 2> Mappings;
std::string AuxiliaryFile;

if (!Triple.isAndroid()) return Mappings;

llvm::SmallString<261> NDKInjection{sysroot};
llvm::sys::path::append(NDKInjection, "posix_filesystem.apinotes");

AuxiliaryFile =
GetPlatformAuxiliaryFile("android", "posix_filesystem.apinotes",
SearchPathOpts);
if (!AuxiliaryFile.empty())
Mappings.emplace_back(std::string(NDKInjection), AuxiliaryFile);

return Mappings;
}

SmallVector<std::pair<std::string, std::string>, 2> GetWindowsFileMappings(
ASTContext &Context,
const llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> &driverVFS,
Expand Down Expand Up @@ -612,9 +589,5 @@ ClangInvocationFileMapping swift::getClangInvocationFileMapping(

result.redirectedFiles.append(GetWindowsFileMappings(
ctx, vfs, result.requiresBuiltinHeadersInSystemModules));

result.redirectedFiles.append(GetAndroidFileMappings(ctx, sysroot.str().str(),
vfs));

return result;
}
19 changes: 16 additions & 3 deletions stdlib/public/Platform/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,10 +474,23 @@ if("ANDROID" IN_LIST SWIFT_SDKS)
endif()
endforeach()

set(android_posix_filesystem_apinotes_source "posix_filesystem.apinotes")
set(apinotes_subdir "${SWIFTLIB_DIR}/apinotes")
add_custom_command_target(
copy_android_posix_filesystem_apinotes_resource
COMMAND
"${CMAKE_COMMAND}" "-E" "make_directory" ${apinotes_subdir}
COMMAND
"${CMAKE_COMMAND}" "-E" "copy_if_different"
"${CMAKE_CURRENT_SOURCE_DIR}/${android_posix_filesystem_apinotes_source}" ${apinotes_subdir}
OUTPUT ${apinotes_subdir}/${android_posix_filesystem_apinotes_source}
COMMENT "Copying Android posix_filesystem API notes to resource directories")
add_dependencies(sdk-overlay ${copy_android_posix_filesystem_apinotes_resource})
list(APPEND android_modulemap_target_list ${copy_android_posix_filesystem_apinotes_resource})
swift_install_in_component(FILES
posix_filesystem.apinotes
DESTINATION "share"
COMPONENT sdk-overlay)
"${android_posix_filesystem_apinotes_source}"
DESTINATION "lib/swift/apinotes"
COMPONENT sdk-overlay)
endif()
add_custom_target(android_modulemap DEPENDS ${android_modulemap_target_list})
set_property(TARGET android_modulemap PROPERTY FOLDER "Miscellaneous")
Expand Down