AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add CMake path to gradle

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

Review-Url: https://codereview.chromium.org/1921553009
This commit is contained in:
liyuqian 2016-05-02 05:33:20 -07:00 committed by Commit bot
parent 9516775857
commit 2275017e45
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
platform_tools/android/apps/build.gradle
View File

@ -19,12 +19,12 @@ allprojects {
}
}
def setupSkiaLibraryBuild(project, appVariants, buildCmd) {
def setupSkiaLibraryBuild(project, appVariants, buildCmd, requireCMake = false) {
appVariants.all{ variant ->
def buildNativeLib = project.task("${variant.name}_SkiaNativeLib", type:Exec) {
workingDir '../../../..' // top-level skia directory
commandLine constructBuildCommand(variant, buildCmd).split()
environment PATH: getPathWithDepotTools()
environment PATH: getPathWithDeps(requireCMake)
environment ANDROID_SDK_ROOT: getSDKPath()
}
buildNativeLib.onlyIf { !project.hasProperty("suppressNativeBuild") }
@ -63,8 +63,7 @@ def getSDKPath() {
return path
}
def getPathWithDepotTools() {
System.getenv("PATH") + ":" + getLocalProperties().getProperty('depot_tools.dir', null)
def getPathWithDeps(requireCMake = false) {
String path = System.getenv("PATH")
if (!path.contains("depot_tools")) {
path += ":" + getLocalProperties().getProperty('depot_tools.dir', null)
@ -74,6 +73,18 @@ def getPathWithDepotTools() {
throw GradleScriptException("Depot Tools not found! Please update your path to include" +
" depot_tools or define depot_tools.dir in gradle.properties")
}
if (requireCMake) {
String cmakePath = getSDKPath() + "/cmake/bin"
if (!file(cmakePath).exists()) {
throw new GradleScriptException("cmake not found! Please install the android SDK version" +
" of cmake.", null);
}
if (!path.contains(cmakePath)) {
path = cmakePath + ":" + path
}
}
return path
}

2
platform_tools/android/apps/vulkanviewer/build.gradle
View File

@ -20,5 +20,5 @@ android {
sourceSets.main.jniLibs.srcDir "src/main/libs"
productFlavors { arm {}; arm64 {}; x86 {}; x86_64 {}; mips {}; mips64 {}; }
setupSkiaLibraryBuild(project, applicationVariants, "--vulkan CopyVulkanViewerDeps")
setupSkiaLibraryBuild(project, applicationVariants, "--vulkan CopyVulkanViewerDeps", true)
}