Skip to content
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

Jump to bottom

GH-43390: [C++] Add support for building on Android porting patch from vcpkg #43407

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

GH-43390: [C++] Add support for building on Android porting patch from vcpkg #43407

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
b5bb2ad
GH-43390: [C++] Add support for building on Android porting patch fro…
raulcd Jul 24, 2024
4e2c981
Make the linter happy
raulcd Jul 24, 2024
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
4 changes: 3 additions & 1 deletion cpp/src/arrow/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,9 @@ if(WIN32)
list(APPEND ARROW_SYSTEM_LINK_LIBS "ws2_32")
endif()

if(NOT WIN32 AND NOT APPLE)
if(NOT WIN32
AND NOT APPLE
AND NOT ANDROID)
# Pass -lrt on Linux only
list(APPEND ARROW_SYSTEM_LINK_LIBS rt)
endif()
Expand Down
2 changes: 2 additions & 0 deletions cpp/src/arrow/vendored/musl/strptime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@
#undef HAVE_LANGINFO

#ifndef _WIN32
# if !(defined(__ANDROID__) && __ANDROID_API__ < 26)
Comment on lines 20 to +21
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we unify this condition?

#if !defined(_WIN32) && !(defined(__ANDROID__) && __ANDROID_API__ < 26)

BTW, is Android API < 26 still supported?
It seems that Android API 25 is Android 7.1 based on https://developer.android.com/guide/topics/manifest/uses-sdk-element#api-level-table .
It seems that Android 11 or earlier reached EOL based on https://endoflife.date/android .

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's a good point, we can remove this patch and probably remove it also upstream on the next release. It shouldn't be necessary as unsupported version, I suppose if we add an Android CI job might be worth validating

#define HAVE_LANGINFO 1
#endif
#endif

#ifdef HAVE_LANGINFO
#include <langinfo.h>
Expand Down
Loading