Bugfix failing builds (#341)
* Fix interpreter for libnd4j tests and drop test script * Remove mingw when specifying javacpp.platform, add new profile that triggers when javacpp.platform is windows-x86_64 * Update android 32 bit toolchain for x86 * Try triple instead of -target * Change to -target * Update 32 bit arm * Change android bin path * Update arm 32 bit build again Co-authored-by: Adam Gibson <1144306+agibsonccc@users.noreply.github.com>master
parent
838c3ddb5a
commit
3cbba49518
|
@ -220,8 +220,9 @@ case "$OS" in
|
||||||
|
|
||||||
setandroid_defaults
|
setandroid_defaults
|
||||||
|
|
||||||
|
# Note here for android 32 bit prefix on the binutils is different
|
||||||
export ANDROID_BIN="$ANDROID_NDK/toolchains/arm-linux-androideabi-4.9/prebuilt/$KERNEL/"
|
# See https://developer.android.com/ndk/guides/other_build_systems
|
||||||
|
export ANDROID_BIN="$ANDROID_NDK/toolchains/arm-linux-androideabi/prebuilt/$KERNEL/"
|
||||||
export ANDROID_CPP="$ANDROID_NDK/sources/cxx-stl/llvm-libc++/"
|
export ANDROID_CPP="$ANDROID_NDK/sources/cxx-stl/llvm-libc++/"
|
||||||
export ANDROID_CC="$ANDROID_NDK/toolchains/llvm/prebuilt/$KERNEL/bin/clang"
|
export ANDROID_CC="$ANDROID_NDK/toolchains/llvm/prebuilt/$KERNEL/bin/clang"
|
||||||
export ANDROID_ROOT="$ANDROID_NDK/platforms/android-$ANDROID_VERSION/arch-arm/"
|
export ANDROID_ROOT="$ANDROID_NDK/platforms/android-$ANDROID_VERSION/arch-arm/"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# CMake toolchain to build for Android 5.0 or newer. Sample usage:
|
# CMake toolchain to build for Android 5.0 or newer. Sample usage:
|
||||||
#
|
#
|
||||||
set(CMAKE_SYSTEM_NAME Android)
|
set(CMAKE_SYSTEM_NAME Android)
|
||||||
set(CMAKE_ANDROID_ARCH_ABI arm64-v8a)
|
set(CMAKE_ANDROID_ARCH_ABI armeabi-v7a)
|
||||||
set(CMAKE_ANDROID_NDK "$ENV{ANDROID_NDK}")
|
set(CMAKE_ANDROID_NDK "$ENV{ANDROID_NDK}")
|
||||||
set(CMAKE_ANDROID_STL_TYPE c++_shared)
|
set(CMAKE_ANDROID_STL_TYPE c++_shared)
|
||||||
set(CMAKE_SYSTEM_VERSION "$ENV{ANDROID_VERSION}")
|
set(CMAKE_SYSTEM_VERSION "$ENV{ANDROID_VERSION}")
|
||||||
|
@ -18,5 +18,5 @@ endif (WIN32)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
add_definitions(-D__ANDROID_API__=$ENV{ANDROID_VERSION} -DANDROID -fPIC -ffunction-sections -funwind-tables -fstack-protector-strong -target aarch64-none-linux-android -march=armv8-a)
|
add_definitions(-D__ANDROID_API__=$ENV{ANDROID_VERSION} -DANDROID -fPIC -ffunction-sections -funwind-tables -fstack-protector-strong -target armv7a-linux-androideabi)
|
||||||
|
|
||||||
|
|
|
@ -18,5 +18,5 @@ endif (WIN32)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
add_definitions(-D__ANDROID_API__=$ENV{ANDROID_VERSION} -DANDROID -fPIC -ffunction-sections -funwind-tables -fstack-protector-strong -target x86-none-linux-android)
|
add_definitions(-D__ANDROID_API__=$ENV{ANDROID_VERSION} -DANDROID -fPIC -ffunction-sections -funwind-tables -fstack-protector-strong -target i686-linux-android)
|
||||||
|
|
||||||
|
|
|
@ -184,7 +184,7 @@
|
||||||
<skip>${libnd4j.test.skip}</skip>
|
<skip>${libnd4j.test.skip}</skip>
|
||||||
<workingDirectory>${basedir}/tests_cpu</workingDirectory>
|
<workingDirectory>${basedir}/tests_cpu</workingDirectory>
|
||||||
<buildCommand>
|
<buildCommand>
|
||||||
<program>sh</program>
|
<program>bash</program>
|
||||||
<argument>run_tests.sh</argument>
|
<argument>run_tests.sh</argument>
|
||||||
<argument>--chip</argument>
|
<argument>--chip</argument>
|
||||||
<argument>${libnd4j.chip}</argument>
|
<argument>${libnd4j.chip}</argument>
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
mvn clean install -Djavacpp.platform=android-arm64 -Dmaven.test.skip=true -Djavacpp.platform.compiler=$ANDROID_NDK/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++
|
|
|
@ -293,6 +293,32 @@
|
||||||
<os>
|
<os>
|
||||||
<family>windows</family>
|
<family>windows</family>
|
||||||
</os>
|
</os>
|
||||||
|
<property>
|
||||||
|
<name>!javacpp.platform</name>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.bytedeco</groupId>
|
||||||
|
<artifactId>javacpp</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<properties>${javacpp.platform}-mingw</properties>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<id>mingw-windows-platform</id>
|
||||||
|
<activation>
|
||||||
|
<os>
|
||||||
|
<family>windows</family>
|
||||||
|
</os>
|
||||||
|
<property>
|
||||||
|
<name>javacpp.platform</name>
|
||||||
|
<value>windows-x86_64</value>
|
||||||
|
</property>
|
||||||
</activation>
|
</activation>
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
@ -306,7 +332,6 @@
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</profile>
|
</profile>
|
||||||
|
|
||||||
<profile>
|
<profile>
|
||||||
<id>libnd4j-assembly</id>
|
<id>libnd4j-assembly</id>
|
||||||
<activation>
|
<activation>
|
||||||
|
|
Loading…
Reference in New Issue