From a5dc7329ffcea443abefd1537030416ea40da0a4 Mon Sep 17 00:00:00 2001 From: Chris Sarbora Date: Sun, 29 Dec 2024 02:02:27 -0600 Subject: [PATCH] eliminate gradle horror show now that hogmaker is self-contained --- android/build.gradle | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 8c60e5ec0..c41f02242 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -4,23 +4,6 @@ repositories { mavenCentral() } -def hostBuildDir = rootProject.layout.buildDirectory.file("host").get().asFile -tasks.register('configureHostTools', Exec) { - workingDir ".." - commandLine "cmake", "-B", hostBuildDir, "-G", "Ninja Multi-Config" - inputs.files fileTree(project.rootDir).matching { include "**/CMakeLists", "**/*.cmake" } - outputs.file new File(hostBuildDir, "HogMakerConfig.cmake") -} -["Debug", "RelWithDebInfo"].each { buildConfig -> - def buildHostToolsTask = tasks.register('buildHostTools' + buildConfig, Exec) { - workingDir ".." - commandLine "cmake", "--build", hostBuildDir, "--target", "HogMaker", "--config", buildConfig - outputs.file new File(new File(new File(hostBuildDir, "tools"), buildConfig), "HogMaker") - dependsOn configureHostTools - } - preBuild.dependsOn buildHostToolsTask -} - android { namespace "com.descent3.droid" compileSdk 34 @@ -31,7 +14,7 @@ android { versionName "1.0" externalNativeBuild { cmake { - arguments "-DANDROID_APP_PLATFORM=android-19", "-DANDROID_STL=c++_static", "-DHogMaker_DIR=" + hostBuildDir, "-DENABLE_LOGGER=ON" + arguments "-DANDROID_APP_PLATFORM=android-19", "-DANDROID_STL=c++_static", "-DENABLE_LOGGER=ON" // abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64' abiFilters 'arm64-v8a' }