Update Android Gradle build script for cmake arguments

gpx1000 · gpx1000 · commit 282ec29bdac3 · 2025-07-03T09:58:23.000-07:00
- Moved `-DCHAPTER` argument from `android.externalNativeBuild.cmake` to `defaultConfig.externalNativeBuild.cmake` for better configuration consistency.
diff --git a/attachments/android/app/build.gradle b/attachments/android/app/build.gradle
@@ -13,6 +13,12 @@ android {
 
         // Define which chapter to build (default to 34_android)
         buildConfigField "String", "CHAPTER", "\"${project.findProperty('chapter') ?: '34_android'}\""
+
+        externalNativeBuild {
+            cmake {
+                arguments "-DCHAPTER=${project.findProperty('chapter') ?: '34_android'}"
+            }
+        }
     }
 
     buildTypes {
@@ -31,7 +37,6 @@ android {
         cmake {
             path "src/main/cpp/CMakeLists.txt"
             version "3.22.1"
-            arguments "-DCHAPTER=${project.findProperty('chapter') ?: '34_android'}"
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,12 @@ android {`
`13`	`13`
`14`	`14`	`// Define which chapter to build (default to 34_android)`
`15`	`15`	`buildConfigField "String", "CHAPTER", "\"${project.findProperty('chapter') ?: '34_android'}\""`
	`16`	`+`
	`17`	`+ externalNativeBuild {`
	`18`	`+ cmake {`
	`19`	`+ arguments "-DCHAPTER=${project.findProperty('chapter') ?: '34_android'}"`
	`20`	`+ }`
	`21`	`+ }`
`16`	`22`	`}`
`17`	`23`
`18`	`24`	`buildTypes {`
`@@ -31,7 +37,6 @@ android {`
`31`	`37`	`cmake {`
`32`	`38`	`path "src/main/cpp/CMakeLists.txt"`
`33`	`39`	`version "3.22.1"`
`34`		`- arguments "-DCHAPTER=${project.findProperty('chapter') ?: '34_android'}"`
`35`	`40`	`}`
`36`	`41`	`}`
`37`	`42`