Index: platform_tools/android/apps/sample_app/build.gradle |
diff --git a/platform_tools/android/apps/sample_app/build.gradle b/platform_tools/android/apps/sample_app/build.gradle |
index def446a3826d31a7098a39599983c0c84e302416..46789804338048d5c3d36a56ecad05b9e666611f 100644 |
--- a/platform_tools/android/apps/sample_app/build.gradle |
+++ b/platform_tools/android/apps/sample_app/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, "CopySampleAppDeps").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, "CopySampleAppDeps") |
} |