Skip to content

Fix Android native math library linkage #211

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

Open
geirsagberg wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −5
Open

Fix Android native math library linkage #211

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
11 changes: 6 additions & 5 deletions src/main/c/h3-java/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,12 @@ target_link_libraries(h3-java "${H3_BUILD_ROOT}/${H3_CORE_LIBRARY_PATH}${CMAKE_S
option(H3_JAVA_ANDROID "Whether to enable Android specific build flags")
if(H3_JAVA_ANDROID)
target_link_options(h3-java PRIVATE "-Wl,-z,max-page-size=16384")
endif()

find_library(M_LIB m)
if(M_LIB)
target_link_libraries(h3-java ${M_LIB})
target_link_libraries(h3-java m)
else()
find_library(M_LIB m)
if(M_LIB)
target_link_libraries(h3-java ${M_LIB})
endif()
endif()

find_program(CLANG_FORMAT_PATH clang-format)
Expand Down
5 changes: 5 additions & 0 deletions src/main/c/h3-java/build-h3.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,11 @@ for image in $DOCKCROSS_IMAGES; do
# Perform the actual build inside Docker
$BUILD_ROOT/dockcross --args "-v $JAVA_HOME:/java" src/main/c/h3-java/build-h3-docker.sh "$BUILD_ROOT" "$UPGRADE_CMAKE" "$CMAKE_ROOT" "$SPECIAL_ANDROID_FLAGS"

if [[ "$image" == android-* ]]; then
$BUILD_ROOT/dockcross readelf -d "$BUILD_ROOT/lib/libh3-java.so" |
grep -q 'Shared library: \[libm.so\]'
fi

# Copy the built artifact into the source tree so it can be included in the
# built JAR.
OUTPUT_ROOT=src/main/resources/$image
Expand Down
Loading