From 6529371326dbab4b32c6d7fbc1ed84a159e00d1a Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 13 Oct 2016 20:06:31 -0400 Subject: [PATCH] v0.4.3: improved ndk build task Should now work on more devices than just mine Also included .so files built with new script, no funtional change, but their size is a bit different --- SPD-classes/build.gradle | 25 +++++++++++------- .../main/jniLibs/armeabi/libFroyoGLES20Fix.so | Bin 13652 -> 13720 bytes .../src/main/jniLibs/x86/libFroyoGLES20Fix.so | Bin 5364 -> 5428 bytes .../src/main/jniSources/Application.mk | 4 +-- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/SPD-classes/build.gradle b/SPD-classes/build.gradle index 7d8eec825..92c3492cf 100644 --- a/SPD-classes/build.gradle +++ b/SPD-classes/build.gradle @@ -8,20 +8,25 @@ android { description "builds JNI libs from source. " + "This requires the Android NDK and is optional as precompiled libs are provided." - workingDir = "./src/main" + def root = project(':SPD-classes').projectDir def ndkDir = android.ndkDirectory - //Need to start cmd first on windows systems, otherwise these are the same + //Need to execute through cmd on windows systems if (System.properties["os.name"].toLowerCase().contains("windows")){ - commandLine "cmd", "/c" , "$ndkDir${File.separator}ndk-build " + - "NDK_APPLICATION_MK=./jniSources/Application.mk " + - "NDK_LIBS_OUT=./jniLibs" + executable "cmd" + args "/c", "$ndkDir${File.separator}ndk-build", + "NDK_PROJECT_PATH=$root/src/main/jniSources", + "NDK_APPLICATION_MK=$root/src/main/jniSources/Application.mk", + "APP_BUILD_SCRIPT=$root/src/main/jniSources/Android.mk", + "NDK_LIBS_OUT=$root/src/main/jniLibs" + } else { - commandLine "$ndkDir${File.separator}ndk-build " + - "NDK_APPLICATION_MK=./jniSources/Application.mk " + - "NDK_LIBS_OUT=./jniLibs" + executable "$ndkDir/ndk-build" + args "NDK_PROJECT_PATH=$root/src/main/jniSources", + "NDK_APPLICATION_MK=$root/src/main/jniSources/Application.mk", + "APP_BUILD_SCRIPT=$root/src/main/jniSources/Android.mk", + "NDK_LIBS_OUT=$root/src/main/jniLibs" + } - } - } \ No newline at end of file diff --git a/SPD-classes/src/main/jniLibs/armeabi/libFroyoGLES20Fix.so b/SPD-classes/src/main/jniLibs/armeabi/libFroyoGLES20Fix.so index c71ffc32134a00499645a3ddcf58aa70554c4b68..6f232486e9dda91761df4edeba96c0a0575477cd 100644 GIT binary patch delta 3230 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 delta 844 zcmYk4O=uHQ6oubR{w6j~l1`$wX>DRco3v4b1Qii%FvVyKDh5%q(KextravSDDpG85 zRVC1HyK-wqi`htmmf|i8TW}*}p@>L!K?FBhxX_O0O(Jx{nQz`Z_ubsNbF0Ix(5hF6 zmVD>OBnx9)CWgzwm;jVz=x|#%u)$^S_#(Ioe-l1e5MHpfaoqYI5xPo^Q_j5^l88uB zNbvMbWY!zzyDwAU7oR+|Xlv6aTQ|?~w2XXig%*VHQ7_6E$3{2nVny9*-@1Y4&;tB3 zAost}j<8AZ!~@FpOkU00kEv=tJ9%Y3JEvyyR1}9j@%-(3W4X+1W=<`z>D=BW{SrfR zK}}DMj2tV>vs`v^mIe(cLa3D)Ap^u;8J*Ev!(W>*QUCE6ftC#ygfi_I!dBGuX8@s= z%C5mLJZk>XG;O)I)yr5h9r*k-9++5(2V7tRblBg<193dqurUfs;91ZJo?bBqnqPM{ z4F`j%+GP`I-oec8*6n$HSfDL4Lfe+&+IORb%wp^x|S4%6$cGW1shy z#boKRcv+4-kfm5nHgbO(`VF7=_P_6)Y5M_eHK7^WFb^euB1*z4{#VoLC~O_{f^|>= zTi_@dMcgeg2`+(Ya1E@2Rj}f-kcA=^CspO8tNYPY-qzj@-FW8fBe-GMSU>k5K9#&) zUO^93#o7b%Pln;uFKn@Wv}m8gbTsVam7Jq43YRFR3<(a(Dg!2cN~x&$t@@B7zeI1G q3Vl>;CZ4cL-{9#34lhVn*9Rd;pIm-Z82{0y$J*QuAwm7_gZ}_)Ir9?$ diff --git a/SPD-classes/src/main/jniSources/Application.mk b/SPD-classes/src/main/jniSources/Application.mk index e2b8a6ef6..e40f0baf5 100644 --- a/SPD-classes/src/main/jniSources/Application.mk +++ b/SPD-classes/src/main/jniSources/Application.mk @@ -1,3 +1,3 @@ APP_ABI := armeabi x86 -APP_BUILD_SCRIPT := ./jniSources/Android.mk -APP_OPTIM := release \ No newline at end of file +APP_OPTIM := release +APP_PLATFORM := android-8 \ No newline at end of file