Skip to content

N
Native_SDK
Unverified Commit c1605c99 by Omar Zohdi
Options

Updated gradle API usage.

Updated gradle API usage to match gradle 6.0 to be compatible with later gradle versions.
parent 692336b3
Showing with 36 additions and 64 deletions
examples/OpenCL/MatrixMultiplication/build-android/build.gradle
...@@ -58,8 +58,6 @@ dependencies { ...@@ -58,8 +58,6 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
} }
Set taskDeleted = []
tasks.whenTaskAdded { task -> 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. // 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')) { if (task.name.startsWith('generateJsonModel')) {
...@@ -69,22 +67,17 @@ tasks.whenTaskAdded { task -> ...@@ -69,22 +67,17 @@ 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. // 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 (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.
{ tasks['assemble'].actions.clear()
taskDeleted.add('assemble') tasks['assemble'].dependsOn.clear()
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 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) task.actions.clear()
tasks.remove(task) task.dependsOn.clear()
def flavor = task.name.substring('assemble'.length()) def flavor = task.name.substring('assemble'.length())
if (flavor) if (flavor)
{ {
tasks.create(name: "assemble${flavor}") { task.doLast({
doLast{
"$ANDROID_ABI".replace(" ", "").split(",").each ({ "$ANDROID_ABI".replace(" ", "").split(",").each ({
abi -> abi ->
def path = new File("${project.projectDir}/.cxx/cmake/${flavor.toLowerCase()}/${abi}").getCanonicalPath().replace("\\", "/") def path = new File("${project.projectDir}/.cxx/cmake/${flavor.toLowerCase()}/${abi}").getCanonicalPath().replace("\\", "/")
...@@ -96,8 +89,7 @@ tasks.whenTaskAdded { task -> ...@@ -96,8 +89,7 @@ tasks.whenTaskAdded { task ->
include "**" include "**"
} }
}) })
} })
}
} }
tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"] tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
tasks["assemble"].dependsOn.add(task.name) tasks["assemble"].dependsOn.add(task.name)
...@@ -106,5 +98,4 @@ tasks.whenTaskAdded { task -> ...@@ -106,5 +98,4 @@ tasks.whenTaskAdded { task ->
task.enabled = false task.enabled = false
} }
} }
}
} }
\ No newline at end of file
framework/PVRAssets/build-android/build.gradle
...@@ -29,8 +29,6 @@ android { ...@@ -29,8 +29,6 @@ android {
} }
} }
Set taskDeleted = []
tasks.whenTaskAdded { task -> tasks.whenTaskAdded { task ->
// We add a dependency on all projects dependencies corresponding externalNativeBuild tasks // We add a dependency on all projects dependencies corresponding externalNativeBuild tasks
if (task.name.startsWith('generateJsonModel')) { if (task.name.startsWith('generateJsonModel')) {
...@@ -42,15 +40,14 @@ tasks.whenTaskAdded { task -> ...@@ -42,15 +40,14 @@ tasks.whenTaskAdded { task ->
// We replace these tasks with basically dependencies on the native builds to generate the native library // 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') || task.name.startsWith('verify')) {
if (task.name.startsWith('assemble')){ if (task.name.startsWith('assemble')){
if (!taskDeleted.contains(task.name)) { tasks['assemble'].actions.clear()
taskDeleted.add(task.name) tasks['assemble'].dependsOn.clear()
tasks.remove(task) task.actions.clear() // For verify, this is dummy
tasks.create(name: task.name) // For verify, this is dummy task.dependsOn.clear()
def flavor = task.name.substring('assemble'.length()) def flavor = task.name.substring('assemble'.length())
tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"] tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
} }
}
else{ else{
task.enabled = false task.enabled = false
} }
......
framework/PVRCore/build-android/build.gradle
...@@ -29,8 +29,6 @@ android { ...@@ -29,8 +29,6 @@ android {
} }
} }
Set taskDeleted = []
tasks.whenTaskAdded { task -> tasks.whenTaskAdded { task ->
// We add a dependency on all projects dependencies corresponding externalNativeBuild tasks // We add a dependency on all projects dependencies corresponding externalNativeBuild tasks
if (task.name.startsWith('generateJsonModel')) { if (task.name.startsWith('generateJsonModel')) {
...@@ -42,15 +40,14 @@ tasks.whenTaskAdded { task -> ...@@ -42,15 +40,14 @@ tasks.whenTaskAdded { task ->
// We replace these tasks with basically dependencies on the native builds to generate the native library // 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') || task.name.startsWith('verify')) {
if (task.name.startsWith('assemble')){ if (task.name.startsWith('assemble')){
if (!taskDeleted.contains(task.name)) { tasks['assemble'].actions.clear()
taskDeleted.add(task.name) tasks['assemble'].dependsOn.clear()
tasks.remove(task) task.actions.clear() // For verify, this is dummy
tasks.create(name: task.name) // For verify, this is dummy task.dependsOn.clear()
def flavor = task.name.substring('assemble'.length()) def flavor = task.name.substring('assemble'.length())
tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"] tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
} }
}
else{ else{
task.enabled = false task.enabled = false
} }
......
framework/PVRPfx/build-android/build.gradle
...@@ -29,7 +29,6 @@ android { ...@@ -29,7 +29,6 @@ android {
} }
} }
Set taskDeleted = []
tasks.whenTaskAdded { task -> tasks.whenTaskAdded { task ->
// We add a dependency on all projects dependencies corresponding externalNativeBuild tasks // We add a dependency on all projects dependencies corresponding externalNativeBuild tasks
...@@ -42,15 +41,14 @@ tasks.whenTaskAdded { task -> ...@@ -42,15 +41,14 @@ tasks.whenTaskAdded { task ->
// We replace these tasks with basically dependencies on the native builds to generate the native library // 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') || task.name.startsWith('verify')) {
if (task.name.startsWith('assemble')){ if (task.name.startsWith('assemble')){
if (!taskDeleted.contains(task.name)) { tasks['assemble'].actions.clear()
taskDeleted.add(task.name) tasks['assemble'].dependsOn.clear()
tasks.remove(task) task.actions.clear() // For verify, this is dummy
tasks.create(name: task.name) // For verify, this is dummy task.dependsOn.clear()
def flavor = task.name.substring('assemble'.length()) def flavor = task.name.substring('assemble'.length())
tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"] tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
} }
}
else{ else{
task.enabled = false task.enabled = false
} }
......
framework/PVRShell/build-android/build.gradle
...@@ -29,8 +29,6 @@ android { ...@@ -29,8 +29,6 @@ android {
} }
} }
Set taskDeleted = []
tasks.whenTaskAdded { task -> tasks.whenTaskAdded { task ->
// We add a dependency on all projects dependencies corresponding externalNativeBuild tasks // We add a dependency on all projects dependencies corresponding externalNativeBuild tasks
if (task.name.startsWith('generateJsonModel')) { if (task.name.startsWith('generateJsonModel')) {
...@@ -42,15 +40,14 @@ tasks.whenTaskAdded { task -> ...@@ -42,15 +40,14 @@ tasks.whenTaskAdded { task ->
// We replace these tasks with basically dependencies on the native builds to generate the native library // 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') || task.name.startsWith('verify')) {
if (task.name.startsWith('assemble')){ if (task.name.startsWith('assemble')){
if (!taskDeleted.contains(task.name)) { tasks['assemble'].actions.clear()
taskDeleted.add(task.name) tasks['assemble'].dependsOn.clear()
tasks.remove(task) task.actions.clear() // For verify, this is dummy
tasks.create(name: task.name) // For verify, this is dummy task.dependsOn.clear()
def flavor = task.name.substring('assemble'.length()) def flavor = task.name.substring('assemble'.length())
tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"] tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
} }
}
else{ else{
task.enabled = false task.enabled = false
} }
......
framework/PVRUtils/OpenCL/build-android/build.gradle
...@@ -28,8 +28,6 @@ android { ...@@ -28,8 +28,6 @@ android {
} }
} }
Set taskDeleted = []
tasks.whenTaskAdded { task -> tasks.whenTaskAdded { task ->
// We add a dependency on all projects dependencies corresponding externalNativeBuild tasks // We add a dependency on all projects dependencies corresponding externalNativeBuild tasks
if (task.name.startsWith('generateJsonModel')) { if (task.name.startsWith('generateJsonModel')) {
...@@ -41,15 +39,14 @@ tasks.whenTaskAdded { task -> ...@@ -41,15 +39,14 @@ tasks.whenTaskAdded { task ->
// We replace these tasks with basically dependencies on the native builds to generate the native library // 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') || task.name.startsWith('verify')) {
if (task.name.startsWith('assemble')){ if (task.name.startsWith('assemble')){
if (!taskDeleted.contains(task.name)) { tasks['assemble'].actions.clear()
taskDeleted.add(task.name) tasks['assemble'].dependsOn.clear()
tasks.remove(task) task.actions.clear() // For verify, this is dummy
tasks.create(name: task.name) // For verify, this is dummy task.dependsOn.clear()
def flavor = task.name.substring('assemble'.length()) def flavor = task.name.substring('assemble'.length())
tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"] tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
} }
}
else{ else{
task.enabled = false task.enabled = false
} }
......
framework/PVRUtils/OpenGLES/build-android/build.gradle
...@@ -29,8 +29,6 @@ android { ...@@ -29,8 +29,6 @@ android {
} }
} }
Set taskDeleted = []
tasks.whenTaskAdded { task -> tasks.whenTaskAdded { task ->
// We add a dependency on all projects dependencies corresponding externalNativeBuild tasks // We add a dependency on all projects dependencies corresponding externalNativeBuild tasks
if (task.name.startsWith('generateJsonModel')) { if (task.name.startsWith('generateJsonModel')) {
...@@ -42,15 +40,14 @@ tasks.whenTaskAdded { task -> ...@@ -42,15 +40,14 @@ tasks.whenTaskAdded { task ->
// We replace these tasks with basically dependencies on the native builds to generate the native library // 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') || task.name.startsWith('verify')) {
if (task.name.startsWith('assemble')){ if (task.name.startsWith('assemble')){
if (!taskDeleted.contains(task.name)) { tasks['assemble'].actions.clear()
taskDeleted.add(task.name) tasks['assemble'].dependsOn.clear()
tasks.remove(task) task.actions.clear() // For verify, this is dummy
tasks.create(name: task.name) // For verify, this is dummy task.dependsOn.clear()
def flavor = task.name.substring('assemble'.length()) def flavor = task.name.substring('assemble'.length())
tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"] tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
} }
}
else{ else{
task.enabled = false task.enabled = false
} }
......
framework/PVRUtils/Vulkan/build-android/build.gradle
...@@ -42,15 +42,14 @@ tasks.whenTaskAdded { task -> ...@@ -42,15 +42,14 @@ tasks.whenTaskAdded { task ->
// We replace these tasks with basically dependencies on the native builds to generate the native library // 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') || task.name.startsWith('verify')) {
if (task.name.startsWith('assemble')){ if (task.name.startsWith('assemble')){
if (!taskDeleted.contains(task.name)) { tasks['assemble'].actions.clear()
taskDeleted.add(task.name) tasks['assemble'].dependsOn.clear()
tasks.remove(task) task.actions.clear() // For verify, this is dummy
tasks.create(name: task.name) // For verify, this is dummy task.dependsOn.clear()
def flavor = task.name.substring('assemble'.length()) def flavor = task.name.substring('assemble'.length())
tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"] tasks["assemble${flavor}"].dependsOn = ["externalNativeBuild${flavor}"]
} }
}
else{ else{
task.enabled = false task.enabled = false
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment