Updated gradle API usage.

examples/OpenCL/MatrixMultiplication/build-android/build.gradle

@@ -58,8 +58,6 @@ dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
 
-Set taskDeleted = []
-
 tasks.whenTaskAdded { task ->
 	// We add a dependency on all projects dependencies corresponding externalNativeBuild tasks - If these lines are removed, the dependencies are not built as they should be.
 	if (task.name.startsWith('generateJsonModel')) {
@@ -69,42 +67,35 @@ tasks.whenTaskAdded { task ->
 	
 	// The following lines reconfigure the assemble, assembleDebug, assembleRelease tasks to just call the native build. All other parts of it are disabled.
 	if (task.name.startsWith('assemble') || task.name.startsWith('verify') || task.name.startsWith('check')) {
-		if (! taskDeleted.contains('assemble') && !tasks.findByName('assemble')) //Replace the "assemble" task with a task calling assemble and all flavors.
-		{
-			taskDeleted.add('assemble')
-			tasks.remove(tasks['assemble'])
-			tasks.create(name: 'assemble')
-			tasks["assemble"].dependsOn = []
-		}
-		if (!taskDeleted.contains(task.name)) { // We will be replacing tasks. Ensure we are not in an infinite loop
-			if (task.name.startsWith('assemble') &&! task.name.endsWith('Test')) { // Send to the "else" (disable) everything that is not the "assembleFlavor" tasks
-				taskDeleted.add(task.name)
-				tasks.remove(task)
-				def flavor = task.name.substring('assemble'.length())
-				if (flavor)
-				{
-					tasks.create(name: "assemble${flavor}") {
-						doLast{
-							"$ANDROID_ABI".replace(" ", "").split(",").each ({
-								abi -> 
-								def path = new File("${project.projectDir}/.cxx/cmake/${flavor.toLowerCase()}/${abi}").getCanonicalPath().replace("\\", "/")
-								def inputPath = path + "/bin"
-								def outputPath = "${binOutput}/${flavor.toLowerCase()}/${path.substring(path.lastIndexOf("/")+1)}"
-								copy{
-									from inputPath
-									into outputPath
-									include "**"
-								}
-							})
+
+		tasks['assemble'].actions.clear()
+		tasks['assemble'].dependsOn.clear()
+		if (task.name.startsWith('assemble') &&! task.name.endsWith('Test')) { // Send to the "else" (disable) everything that is not the "assembleFlavor" tasks
+			task.actions.clear()
+			task.dependsOn.clear()
+
+			def flavor = task.name.substring('assemble'.length())
+			if (flavor)
+			{
+				task.doLast({
+					"$ANDROID_ABI".replace(" ", "").split(",").each ({
+						abi -> 
+						def path = new File("${project.projectDir}/.cxx/cmake/${flavor.toLowerCase()}/${abi}").getCanonicalPath().replace("\\", "/")
+						def inputPath = path + "/bin"
+						def outputPath = "${binOutput}/${flavor.toLowerCase()}/${path.substring(path.lastIndexOf("/")+1)}"
+						copy{
+							from inputPath
+							into outputPath
+							include "**"
 						}
-					}
-				}
-				tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
-				tasks["assemble"].dependsOn.add(task.name)
-			}
-			else {
-				task.enabled = false
+					})
+				})
 			}
+			tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
+			tasks["assemble"].dependsOn.add(task.name)
+		}
+		else {
+			task.enabled = false
 		}
 	}
 }
\ No newline at end of file

framework/PVRAssets/build-android/build.gradle

@@ -29,8 +29,6 @@ android {
 	}
 }
 
-Set taskDeleted = []
-
 tasks.whenTaskAdded { task ->
 	// We add a dependency on all projects dependencies corresponding externalNativeBuild tasks
 	if (task.name.startsWith('generateJsonModel')) {
@@ -42,14 +40,13 @@ tasks.whenTaskAdded { task ->
 	// We replace these tasks with basically dependencies on the native builds to generate the native library
 	if (task.name.startsWith('assemble') || task.name.startsWith('verify')) {
 		if (task.name.startsWith('assemble')){
-			if (!taskDeleted.contains(task.name)) {
-				taskDeleted.add(task.name)
-				tasks.remove(task)
-				tasks.create(name: task.name) // For verify, this is dummy
-			
-				def flavor = task.name.substring('assemble'.length())
-				tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
-			}
+			tasks['assemble'].actions.clear()
+			tasks['assemble'].dependsOn.clear()
+			task.actions.clear() // For verify, this is dummy
+			task.dependsOn.clear()
+
+			def flavor = task.name.substring('assemble'.length())
+			tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
 		}
 		else{
 			task.enabled = false

framework/PVRCore/build-android/build.gradle

@@ -29,8 +29,6 @@ android {
 	}
 }
 
-Set taskDeleted = []
-
 tasks.whenTaskAdded { task ->
 	// We add a dependency on all projects dependencies corresponding externalNativeBuild tasks
 	if (task.name.startsWith('generateJsonModel')) {
@@ -42,14 +40,13 @@ tasks.whenTaskAdded { task ->
 	// We replace these tasks with basically dependencies on the native builds to generate the native library
 	if (task.name.startsWith('assemble') || task.name.startsWith('verify')) {
 		if (task.name.startsWith('assemble')){
-			if (!taskDeleted.contains(task.name)) {
-				taskDeleted.add(task.name)
-				tasks.remove(task)
-				tasks.create(name: task.name) // For verify, this is dummy
-			
-				def flavor = task.name.substring('assemble'.length())
-				tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
-			}
+			tasks['assemble'].actions.clear()
+			tasks['assemble'].dependsOn.clear()
+			task.actions.clear() // For verify, this is dummy
+			task.dependsOn.clear()
+
+			def flavor = task.name.substring('assemble'.length())
+			tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
 		}
 		else{
 			task.enabled = false

framework/PVRPfx/build-android/build.gradle

@@ -29,7 +29,6 @@ android {
 	}
 }
 
-Set taskDeleted = []
 
 tasks.whenTaskAdded { task ->
 	// We add a dependency on all projects dependencies corresponding externalNativeBuild tasks
@@ -42,14 +41,13 @@ tasks.whenTaskAdded { task ->
 	// We replace these tasks with basically dependencies on the native builds to generate the native library
 	if (task.name.startsWith('assemble') || task.name.startsWith('verify')) {
 		if (task.name.startsWith('assemble')){
-			if (!taskDeleted.contains(task.name)) {
-				taskDeleted.add(task.name)
-				tasks.remove(task)
-				tasks.create(name: task.name) // For verify, this is dummy
-			
-				def flavor = task.name.substring('assemble'.length())
-				tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
-			}
+			tasks['assemble'].actions.clear()
+			tasks['assemble'].dependsOn.clear()
+			task.actions.clear() // For verify, this is dummy
+			task.dependsOn.clear()
+
+			def flavor = task.name.substring('assemble'.length())
+			tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
 		}
 		else{
 			task.enabled = false

framework/PVRShell/build-android/build.gradle

@@ -29,8 +29,6 @@ android {
 	}
 }
 
-Set taskDeleted = []
-
 tasks.whenTaskAdded { task ->
 	// We add a dependency on all projects dependencies corresponding externalNativeBuild tasks
 	if (task.name.startsWith('generateJsonModel')) {
@@ -42,14 +40,13 @@ tasks.whenTaskAdded { task ->
 	// We replace these tasks with basically dependencies on the native builds to generate the native library
 	if (task.name.startsWith('assemble') || task.name.startsWith('verify')) {
 		if (task.name.startsWith('assemble')){
-			if (!taskDeleted.contains(task.name)) {
-				taskDeleted.add(task.name)
-				tasks.remove(task)
-				tasks.create(name: task.name) // For verify, this is dummy
-			
-				def flavor = task.name.substring('assemble'.length())
-				tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
-			}
+			tasks['assemble'].actions.clear()
+			tasks['assemble'].dependsOn.clear()
+			task.actions.clear() // For verify, this is dummy
+			task.dependsOn.clear()
+
+			def flavor = task.name.substring('assemble'.length())
+			tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
 		}
 		else{
 			task.enabled = false

framework/PVRUtils/OpenCL/build-android/build.gradle

@@ -28,8 +28,6 @@ android {
 	}
 }
 
-Set taskDeleted = []
-
 tasks.whenTaskAdded { task ->
 	// We add a dependency on all projects dependencies corresponding externalNativeBuild tasks
 	if (task.name.startsWith('generateJsonModel')) {
@@ -41,14 +39,13 @@ tasks.whenTaskAdded { task ->
 	// We replace these tasks with basically dependencies on the native builds to generate the native library
 	if (task.name.startsWith('assemble') || task.name.startsWith('verify')) {
 		if (task.name.startsWith('assemble')){
-			if (!taskDeleted.contains(task.name)) {
-				taskDeleted.add(task.name)
-				tasks.remove(task)
-				tasks.create(name: task.name) // For verify, this is dummy
-			
-				def flavor = task.name.substring('assemble'.length())
-				tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
-			}
+			tasks['assemble'].actions.clear()
+			tasks['assemble'].dependsOn.clear()
+			task.actions.clear() // For verify, this is dummy
+			task.dependsOn.clear()
+
+			def flavor = task.name.substring('assemble'.length())
+			tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
 		}
 		else{
 			task.enabled = false

framework/PVRUtils/OpenGLES/build-android/build.gradle

@@ -29,8 +29,6 @@ android {
 	}
 }
 
-Set taskDeleted = []
-
 tasks.whenTaskAdded { task ->
 	// We add a dependency on all projects dependencies corresponding externalNativeBuild tasks
 	if (task.name.startsWith('generateJsonModel')) {
@@ -42,14 +40,13 @@ tasks.whenTaskAdded { task ->
 	// We replace these tasks with basically dependencies on the native builds to generate the native library
 	if (task.name.startsWith('assemble') || task.name.startsWith('verify')) {
 		if (task.name.startsWith('assemble')){
-			if (!taskDeleted.contains(task.name)) {
-				taskDeleted.add(task.name)
-				tasks.remove(task)
-				tasks.create(name: task.name) // For verify, this is dummy
-			
-				def flavor = task.name.substring('assemble'.length())
-				tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
-			}
+			tasks['assemble'].actions.clear()
+			tasks['assemble'].dependsOn.clear()
+			task.actions.clear() // For verify, this is dummy
+			task.dependsOn.clear()
+
+			def flavor = task.name.substring('assemble'.length())
+			tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
 		}
 		else{
 			task.enabled = false

framework/PVRUtils/Vulkan/build-android/build.gradle

@@ -42,14 +42,13 @@ tasks.whenTaskAdded { task ->
 	// We replace these tasks with basically dependencies on the native builds to generate the native library
 	if (task.name.startsWith('assemble') || task.name.startsWith('verify')) {
 		if (task.name.startsWith('assemble')){
-			if (!taskDeleted.contains(task.name)) {
-				taskDeleted.add(task.name)
-				tasks.remove(task)
-				tasks.create(name: task.name) // For verify, this is dummy
-			
-				def flavor = task.name.substring('assemble'.length())
-				tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
-			}
+			tasks['assemble'].actions.clear()
+			tasks['assemble'].dependsOn.clear()
+			task.actions.clear() // For verify, this is dummy
+			task.dependsOn.clear()
+
+			def flavor = task.name.substring('assemble'.length())
+			tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
 		}
 		else{
 			task.enabled = false