Updating Android project after latest changes to IBT.

Author: Dandielo

source/code/example/android/simple/build.gradle.template.kts

@@ -6,7 +6,6 @@ plugins {
 android {
     // Here we use TargetSDK to have possible access to newer APIs
     compileSdk = $(TargetSDK)
-    // buildToolsVersion = "$ (AndroidBuildToolsVersion)"
 
     namespace = "$(Namespace)"
 
@@ -31,6 +30,12 @@ android {
         // Defines a user-friendly version name for your app.
         versionName = "$(VersionName)"
 
+        // By default keep debug symbols, just remove it in release afterwards
+        packaging.jniLibs.keepDebugSymbols += "**/*.so"
+
+        $(IBTBuildSystemIntegration)
+    }
+
     compileOptions {
         targetCompatibility = JavaVersion.VERSION_11
         sourceCompatibility = JavaVersion.VERSION_11
@@ -64,36 +69,6 @@ android {
     }
 }
 
-afterEvaluate {
-    /**
-     * IBT Integration for FastBuild build system.
-     *  To properly handle our build system, we create a new additional tasks that mimic the behavior of built-in CMakeBuild / NdkBuild steps.
-     *  Because gradle requires the outputs to be stored in a sub-folder with a specific ABI name, IBT is handling this by default.
-     *
-     * NOTE: Currently only ARM64 is supported as a value ABI target using the default IBT Pipeline.
-     *  You can add additional ABI support by calling the proper pipeline for the given ABI.
-     */
-    android.buildTypes.configureEach {
-        val buildConfig = this.name.replaceFirstChar { it.titlecase() }
-        val buildPipeline = "Android$(CompileSDK)"
-        val abiList = listOf("ARMv8", "x64")
-
-        var abiTargets = emptyArray<String>()
-        for (abi in abiList)
-        {
-            abiTargets += "-t"
-            abiTargets += "all-${buildPipeline}-${abi}-${buildConfig}"
-        }
-
-        val fbuildTask = tasks.register<Exec>("compile${buildConfig}UsingFastbuild") {
-            workingDir("$(WorkspaceDir)")
-            executable("$(WorkspaceDir)/$(ScriptFile)")
-            commandLine(listOf("$(WorkspaceDir)/$(ScriptFile)", "build") + abiTargets)
-        }
-        tasks["merge${buildConfig}NativeLibs"].dependsOn(fbuildTask)
-    }
-}
-
 dependencies {
     implementation("androidx.appcompat:appcompat:1.7.1")
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))

source/code/example/android/simple/private/example_android.cxx

@@ -47,6 +47,7 @@ struct TestTrait : public ice::Trait
 
     TestTrait(ice::TraitContext& context) noexcept
         : ice::Trait{ context }
+        , timer{ }
     {
         _context.bind<&TestTrait::logic>();
         _context.bind<&TestTrait::gfx>(ice::gfx::ShardID_GfxFrameUpdate);

source/code/example/android/simple/simple.bff

@@ -43,6 +43,7 @@
                 'vulkan_renderer'
                 'iceshard_pipelines'
                 'imgui_module'
+                'shader_tools'
             }
         ]