Index: platform_tools/android/apps/canvasproof/build.gradle |
diff --git a/platform_tools/android/apps/canvasproof/build.gradle b/platform_tools/android/apps/canvasproof/build.gradle |
index 64463e81030a8664f160dea135c65cb5ed108ecc..5493699b730a31ad1f14b4baecb7f4be7bdf91c2 100644 |
--- a/platform_tools/android/apps/canvasproof/build.gradle |
+++ b/platform_tools/android/apps/canvasproof/build.gradle |
@@ -19,19 +19,5 @@ android { |
sourceSets.main.jni.srcDirs = [] //disable automatic ndk-build call |
sourceSets.main.jniLibs.srcDir "src/main/libs" |
productFlavors { arm {}; arm64 {}; x86 {}; x86_64 {}; mips {}; mips64 {}; } |
- applicationVariants.all{ variant -> |
- def buildNativeLib = task("${variant.name}_NativeLib", type:Exec) { |
- workingDir '../../../..' // top-level skia directory |
- commandLine constructBuildCommand(variant, "CopyCanvasProofDeps").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, "CopyCanvasProofDeps") |
} |