ashikk
/
kaliber
mirror of https://github.com/auygun/kaliber.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove hard-coded build variant strings

This commit is contained in:
Attila Uygun 2023-09-05 17:26:17 +02:00
parent 01bffc71ac
commit 48fb1589c6
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
build/android/app/build.gradle
View File

@ -17,10 +17,6 @@ abstract class WriteFileTask extends DefaultTask {
} }
class Utils implements Plugin<Project> { class Utils implements Plugin<Project> {
final def BUILD_TYPES = ['Debug', 'Release'].asImmutable()
final def ARCH_TYPES = ['Arm7', 'Arm8', 'X86_64', 'X86']
final def BUILD_TYPES_REG_EXP = BUILD_TYPES.join('|')
final def ABI_CODES = ["Arm7": "armeabi-v7a", final def ABI_CODES = ["Arm7": "armeabi-v7a",
"Arm8": "arm64-v8a", "Arm8": "arm64-v8a",
"X86_64": "x86_64", "X86_64": "x86_64",
@ -53,16 +49,32 @@ class Utils implements Plugin<Project> {
} }
void forEachBuildVariant(Closure callback) { void forEachBuildVariant(Closure callback) {
project.android.productFlavors.each { flavor -> project.android.productFlavors.each { game ->
if (flavor.dimension == 'game') { if (game.dimension == 'game') {
ARCH_TYPES.each { arch -> project.android.productFlavors.each { arch ->
BUILD_TYPES.each { buildType -> if (arch.dimension == 'arch' && arch.ndk.abiFilters.size() == 1) {
callback(flavor.name.capitalize(), arch, buildType) project.android.buildTypes.each { buildType ->
callback(game.name.capitalize(), arch.name.capitalize(), buildType.name.capitalize())
}
} }
} }
} }
} }
} }
void forEachBuildType(Closure callback) {
project.android.buildTypes.each { buildType ->
callback(buildType.name.capitalize())
}
}
def getBuildTypesRegExp() {
def outList = []
project.android.buildTypes.each { buildType ->
outList += buildType.name.capitalize()
}
return outList
}
} }
def generateGnArgsContent(String buildType, String arch) { def generateGnArgsContent(String buildType, String arch) {
@ -201,13 +213,13 @@ android {
sourceSets { sourceSets {
main { main {
java.srcDirs += ['../../../src/engine/platform/java/com/kaliber/base'] java.srcDirs += ['../../../src/engine/platform/java/com/kaliber/base']
utils.BUILD_TYPES.each { buildType -> utils.forEachBuildType { buildType ->
"${buildType.toLowerCase()}" { "${buildType.toLowerCase()}" {
assets.srcDirs = [getAssetsDir(buildType)] assets.srcDirs = [getAssetsDir(buildType)]
} }
} }
} }
utils.BUILD_TYPES.each { buildType -> utils.forEachBuildType { buildType ->
"${buildType.toLowerCase()}" { "${buildType.toLowerCase()}" {
jniLibs.srcDirs = [getJniLibsDir(buildType)] jniLibs.srcDirs = [getJniLibsDir(buildType)]
} }
@ -276,7 +288,7 @@ utils.addTask('copyJniLibsFor') { String taskName, String buildType, String arch
} }
tasks.configureEach { task -> tasks.configureEach { task ->
def variantPattern = /(\w+)(${getArchTypesRegExp().join('|')})(${utils.BUILD_TYPES_REG_EXP})/ def variantPattern = /(\w+)(${getArchTypesRegExp().join('|')})(${utils.getBuildTypesRegExp().join('|')})/
def match = task.name =~ /^merge/ + variantPattern + /JniLibFolders$/ def match = task.name =~ /^merge/ + variantPattern + /JniLibFolders$/
if (match) { if (match) {