Upgrade Android Gradle plugins

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1926743002

Review-Url: https://codereview.chromium.org/1926743002

1 files changed, 1 insertions, 18 deletions

diff --git a/platform_tools/android/apps/visualbenchsdl/build.gradle b/platform_tools/android/apps/visualbenchsdl/build.gradle
index a7b78fb235..e64e43e204 100644
--- a/platform_tools/android/apps/visualbenchsdl/build.gradle
+++ b/platform_tools/android/apps/visualbenchsdl/build.gradle
@@ -26,22 +26,5 @@ android {
     }
 
     // make sure that app is built and shared libraries are copied to correct directories
-    applicationVariants.all{ variant ->
-
-        def buildNativeLib = task("${variant.name}_NativeLib", type:Exec) {
-            workingDir '../../../..' // top-level skia directory
-            commandLine constructBuildCommand(variant, "CopyVisualBenchDeps").split()
-            environment PATH: getPathWithDepotTools()
-            environment ANDROID_SDK_ROOT: getSDKPath()
-        }
-
-        buildNativeLib.onlyIf { !project.hasProperty("suppressNativeBuild") }
-
-        TaskCollection<Task> assembleTask
-        assembleTask = project.tasks.matching {
-            it.name.contains("assemble") &&
-                    it.name.toLowerCase().endsWith(variant.name.toLowerCase())
-        }
-        assembleTask.getAt(0).dependsOn buildNativeLib
-    }
+    setupSkiaLibraryBuild(project, applicationVariants, "CopyVisualBenchDeps")
 }