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

Add windows JNI support #44257

Closed
wants to merge 7 commits into from
Closed

Add windows JNI support #44257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4d3951a
pull most recent fbjni commits.
erip Sep 24, 2020
9df0a10
add the JNI as primarily defined by Android (see: https://android.goo…
erip Sep 25, 2020
1bdd0e1
use the custom JNI in CI.
erip Sep 25, 2020
b2f9f1a
conditionally link optional libraries for Windows linking.
Sep 25, 2020
cf2af85
skip windows-jni workaround on non-Windows builds.
Sep 25, 2020
b6fe841
add most recent fbjni.
erip Oct 13, 2020
e62256e
replace find and append with consistent USE_* flags
Oct 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions .circleci/scripts/binary_populate_env.sh
View file
Open in desktop
Expand Up @@ -100,8 +100,14 @@ if [[ "$PACKAGE_TYPE" == libtorch ]]; then
POSSIBLE_JAVA_HOMES+=(/usr/local)
POSSIBLE_JAVA_HOMES+=(/usr/lib/jvm/java-8-openjdk-amd64)
POSSIBLE_JAVA_HOMES+=(/Library/Java/JavaVirtualMachines/*.jdk/Contents/Home)
# Add the Windows-specific JNI path
POSSIBLE_JAVA_HOMES+=("$PWD/.circleci/windows-jni/")
for JH in "${POSSIBLE_JAVA_HOMES[@]}" ; do
if [[ -e "$JH/include/jni.h" ]] ; then
# Skip if we're not on Windows but haven't found a JAVA_HOME
if [[ "$JH" == "$PWD/.circleci/windows-jni/" && "$OSTYPE" != "msys" ]] ; then
break
fi
echo "Found jni.h under $JH"
JAVA_HOME="$JH"
BUILD_JNI=ON
Expand Down