Index: platform_tools/android/apps/vulkanviewer/build.gradle |
diff --git a/platform_tools/android/apps/vulkanviewer/build.gradle b/platform_tools/android/apps/vulkanviewer/build.gradle |
index acb6740248626ce82a29633492033e008e003483..d8825c546494cd76a8c54ab428c5d9b5ec836566 100644 |
--- a/platform_tools/android/apps/vulkanviewer/build.gradle |
+++ b/platform_tools/android/apps/vulkanviewer/build.gradle |
@@ -10,7 +10,7 @@ android { |
buildToolsVersion "22.0.1" |
defaultConfig { |
applicationId "org.skia.vulkanviewer" |
- minSdkVersion 9 |
+ minSdkVersion 19 |
targetSdkVersion 19 |
versionCode 1 |
versionName "1.0" |
@@ -19,19 +19,6 @@ 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, "CopyVulkanViewerDeps").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, "--vulkan CopyVulkanViewerDeps") |
} |