feat(android): allow app to define ndkVersion to be used for plugins and app

farfromrefug · farfromrefug · commit ed2b84a23e30 · 2023-11-05T15:15:22.000+01:00
diff --git a/vendor/gradle-app/build.gradle b/vendor/gradle-app/build.gradle
@@ -218,6 +218,10 @@ android {
         }
     }
 
+    if (project.hasProperty("ndkVersion")) {
+        ndkVersion project.ndkVersion
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
diff --git a/vendor/gradle-plugin/build.gradle b/vendor/gradle-plugin/build.gradle
@@ -281,6 +281,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+    if (project.hasProperty("ndkVersion")) {
+        ndkVersion project.ndkVersion
+    }
 
     defaultConfig {
         targetSdkVersion computeTargetSdkVersion()

Original file line number	Diff line number	Diff line change
`@@ -218,6 +218,10 @@ android {`
`218`	`218`	`}`
`219`	`219`	`}`
`220`	`220`
	`221`	`+ if (project.hasProperty("ndkVersion")) {`
	`222`	`+ ndkVersion project.ndkVersion`
	`223`	`+ }`
	`224`	`+`
`221`	`225`	`compileOptions {`
`222`	`226`	`sourceCompatibility JavaVersion.VERSION_17`
`223`	`227`	`targetCompatibility JavaVersion.VERSION_17`
Original file line number	Diff line number	Diff line change
`@@ -281,6 +281,9 @@ android {`
`281`	`281`	`sourceCompatibility JavaVersion.VERSION_17`
`282`	`282`	`targetCompatibility JavaVersion.VERSION_17`
`283`	`283`	`}`
	`284`	`+ if (project.hasProperty("ndkVersion")) {`
	`285`	`+ ndkVersion project.ndkVersion`
	`286`	`+ }`
`284`	`287`
`285`	`288`	`defaultConfig {`
`286`	`289`	`targetSdkVersion computeTargetSdkVersion()`