Skip to content

Remove workarounds for NDK versions before 2017's r16. #148879

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 2 commits into from
Jul 16, 2025
Merged

Remove workarounds for NDK versions before 2017's r16. #148879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
700598e
Remove workarounds for NDK versions before 2017's r16.
enh-google Jul 15, 2025
4d3bc8c
Remove build system references to deleted "android.h".
enh-google Jul 15, 2025
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
1 change: 0 additions & 1 deletion libcxx/include/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,6 @@ set(files
__locale_dir/check_grouping.h
__locale_dir/get_c_locale.h
__locale_dir/locale_base_api.h
__locale_dir/locale_base_api/android.h
__locale_dir/locale_base_api/bsd_locale_fallbacks.h
__locale_dir/locale_base_api/ibm.h
__locale_dir/locale_base_api/musl.h
Expand Down
2 changes: 0 additions & 2 deletions libcxx/include/__locale_dir/locale_base_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,6 @@
// will define those directly.
# if defined(_AIX) || defined(__MVS__)
# include <__locale_dir/locale_base_api/ibm.h>
# elif defined(__ANDROID__)
# include <__locale_dir/locale_base_api/android.h>
# elif defined(__OpenBSD__)
# include <__locale_dir/locale_base_api/openbsd.h>
# elif defined(__wasi__) || _LIBCPP_HAS_MUSL_LIBC
Expand Down
45 changes: 0 additions & 45 deletions libcxx/include/__locale_dir/locale_base_api/android.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion libcxx/include/module.modulemap.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1590,7 +1590,6 @@ module std [system] {
}

module locale_base_api {
textual header "__locale_dir/locale_base_api/android.h"
textual header "__locale_dir/locale_base_api/bsd_locale_fallbacks.h"
textual header "__locale_dir/locale_base_api/ibm.h"
textual header "__locale_dir/locale_base_api/musl.h"
Expand Down
1 change: 0 additions & 1 deletion llvm/utils/gn/secondary/libcxx/include/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1171,7 +1171,6 @@ if (current_toolchain == default_toolchain) {
"__locale_dir/check_grouping.h",
"__locale_dir/get_c_locale.h",
"__locale_dir/locale_base_api.h",
"__locale_dir/locale_base_api/android.h",
"__locale_dir/locale_base_api/bsd_locale_fallbacks.h",
"__locale_dir/locale_base_api/ibm.h",
"__locale_dir/locale_base_api/musl.h",
Expand Down
Loading