Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-08 05:24:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add cleanNDK task and separate jnilib dirs

Browse source 
Build different jni code (into different obj and libs directories) for
the different release/debug and xw4/xw4dbg combinations. This works when
only one build is done, but when doing two some later task tries to put
both multiple same-named libraries into the .apk and so fails. I still
think it's worth adding this to keep from using the wrong binary, but
that needs to be fixed.

cleanNDK just nukes all the directories. Easier than invoking build-ndk
clean...
This commit is contained in:
Eric House 2017-01-19 08:10:16 -08:00
parent 43e8c3ea64
commit 9c142dd6e7
1 changed files with 34 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
xwords4/android/app/build.gradle
View file

@ -1,8 +1,6 @@
import groovy.swing.SwingBuilder import groovy.swing.SwingBuilder
def INITIAL_CLIENT_VERS = 8 def INITIAL_CLIENT_VERS = 8
def LIBS_DEBUG = 'libs-debug'
def LIBS_RELEASE = 'libs-release'
def VERSION_CODE_BASE = 111 def VERSION_CODE_BASE = 111
def VERSION_NAME = '4.4.115' def VERSION_NAME = '4.4.115'
def VARIANTS = [ "xw4", "xw4dbg" ] def VARIANTS = [ "xw4", "xw4dbg" ]
@ -117,11 +115,21 @@ android {
// directories here. AS doesn't respect what's set here: it'll // directories here. AS doesn't respect what's set here: it'll
// compile, but post-install app launch and source-level // compile, but post-install app launch and source-level
// debugging don't work. // debugging don't work.
release { xw4 {
jniLibs.srcDir "../$LIBS_RELEASE" release {
jniLibs.srcDir "../libs-release-xw4"
}
debug {
jniLibs.srcDir "../libs-debug-xw4"
}
} }
debug { xw4dbg {
jniLibs.srcDir "../$LIBS_DEBUG" release {
jniLibs.srcDir "../libs-release-xw4dbg"
}
debug {
jniLibs.srcDir "../libs-debug-xw4dbg"
}
} }
} }
@ -181,18 +189,18 @@ afterEvaluate {
VARIANTS.each { VARIANT -> VARIANTS.each { VARIANT ->
String variantCaps = VARIANT.capitalize() String variantCaps = VARIANT.capitalize()
BUILDS.each { BUILD -> BUILDS.each { BUILD ->
String lib = BUILD == 'Debug' ? LIBS_DEBUG : LIBS_RELEASE
String nameLC = BUILD.toLowerCase() String nameLC = BUILD.toLowerCase()
String name = "ndkBuild${variantCaps}${BUILD}" String lib = "libs-${nameLC}-${VARIANT}"
task "$name"(type: Exec) { String ndkBuildTask = "ndkBuild${variantCaps}${BUILD}"
task "$ndkBuildTask"(type: Exec) {
workingDir '../' workingDir '../'
commandLine './scripts/ndkbuild.sh', '-j3', commandLine './scripts/ndkbuild.sh', '-j3',
"BUILD_TARGET=${nameLC}", "INITIAL_CLIENT_VERS=$INITIAL_CLIENT_VERS", "BUILD_TARGET=${nameLC}", "INITIAL_CLIENT_VERS=$INITIAL_CLIENT_VERS",
"VARIANT=$VARIANT", "NDK_LIBS_OUT=${lib}", "NDK_OUT=./obj-${nameLC}" "VARIANT=$VARIANT", "NDK_LIBS_OUT=${lib}", "NDK_OUT=./obj-${nameLC}-${VARIANT}"
} }
String compileTask = "compile${variantCaps}${BUILD}Ndk" String compileTask = "compile${variantCaps}${BUILD}Ndk"
tasks.getByName(compileTask).dependsOn name tasks.getByName(compileTask).dependsOn ndkBuildTask
} }
} }
@ -206,6 +214,21 @@ afterEvaluate {
preBuild.dependsOn copyStringsTask preBuild.dependsOn copyStringsTask
} }
clean.dependsOn 'cleanNDK'
task cleanNDK(type: Exec) {
ArrayList<String> lst = new ArrayList<String>(["rm", "-rf"]);
BUILDS.each { BUILD ->
String buildLC = BUILD.toLowerCase()
VARIANTS.each { VARIANT ->
lst.add("libs-${buildLC}-${VARIANT}")
lst.add("obj-${buildLC}-${VARIANT}")
}
}
workingDir '../'
commandLine lst
}
gradle.taskGraph.whenReady { taskGraph -> gradle.taskGraph.whenReady { taskGraph ->
if ( taskGraph.hasTask(':app:validateReleaseSigning') ) { if ( taskGraph.hasTask(':app:validateReleaseSigning') ) {
def pass def pass