From f7e4a07587c14952c0f4715ad1e85e97d36669ad Mon Sep 17 00:00:00 2001 From: Zayin Krige Date: Thu, 6 Sep 2018 08:13:53 +0200 Subject: [PATCH 1/2] Update android-arm.properties Update linkpath. this should fix https://github.com/bytedeco/javacpp-presets/issues/38 --- .../org/bytedeco/javacpp/properties/android-arm.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/org/bytedeco/javacpp/properties/android-arm.properties b/src/main/resources/org/bytedeco/javacpp/properties/android-arm.properties index 88c00d127..aa4719256 100644 --- a/src/main/resources/org/bytedeco/javacpp/properties/android-arm.properties +++ b/src/main/resources/org/bytedeco/javacpp/properties/android-arm.properties @@ -18,7 +18,7 @@ platform.compiler.nowarnings=-w platform.compiler.output=-Wl,-rpath,lib/ -D__ANDROID_API__=14 -DANDROID -ffunction-sections -funwind-tables -fstack-protector -Wall -Wno-attributes -nodefaultlibs -fPIC -shared -Wl,--no-undefined -z text -o\u0020 platform.compiler.output2=-Wl,-soname, platform.linkpath.prefix=-L -platform.linkpath=sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/ +platform.linkpath=sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/ platform.link.prefix=-l platform.link.suffix= platform.link=c#:m#:z#:dl#:gcc#:gnustl_static#:log# From ed3a31140f4809c90ff361fcf4c99f3276b02a4a Mon Sep 17 00:00:00 2001 From: Zayin Krige Date: Thu, 6 Sep 2018 08:20:36 +0200 Subject: [PATCH 2/2] Update android-arm.properties fix includepath --- .../org/bytedeco/javacpp/properties/android-arm.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/org/bytedeco/javacpp/properties/android-arm.properties b/src/main/resources/org/bytedeco/javacpp/properties/android-arm.properties index aa4719256..dad811bb0 100644 --- a/src/main/resources/org/bytedeco/javacpp/properties/android-arm.properties +++ b/src/main/resources/org/bytedeco/javacpp/properties/android-arm.properties @@ -5,7 +5,7 @@ platform.root=../android/android-ndk/ platform.sysroot.prefix=--sysroot= platform.sysroot=platforms/android-14/arch-arm/ platform.includepath.prefix=-I -platform.includepath=sources/cxx-stl/gnu-libstdc++/4.9/include/:sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include/:sysroot/usr/include/:sysroot/usr/include/arm-linux-androideabi/ +platform.includepath=sources/cxx-stl/gnu-libstdc++/4.9/include/:sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include/:sysroot/usr/include/:sysroot/usr/include/arm-linux-androideabi/ platform.compiler=toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ platform.compiler.cpp11=-std=c++11 platform.compiler.debug=-O0 -g