Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(70)

Side by Side Diff: platform_tools/android/apps/build.gradle

Issue 1971953003: Warning instead of exception for cmake (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Top-level build file where you can add configuration options common to all su b-projects/modules. 1 // Top-level build file where you can add configuration options common to all su b-projects/modules.
2 2
3 3
4 buildscript { 4 buildscript {
5 repositories { 5 repositories {
6 jcenter() 6 jcenter()
7 } 7 }
8 dependencies { 8 dependencies {
9 classpath 'com.android.tools.build:gradle:2.1.0' 9 classpath 'com.android.tools.build:gradle:2.1.0'
10 10
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 } 70 }
71 71
72 if (!path.contains("depot_tools")) { 72 if (!path.contains("depot_tools")) {
73 throw GradleScriptException("Depot Tools not found! Please update your p ath to include" + 73 throw GradleScriptException("Depot Tools not found! Please update your p ath to include" +
74 " depot_tools or define depot_tools.dir in g radle.properties") 74 " depot_tools or define depot_tools.dir in g radle.properties")
75 } 75 }
76 76
77 if (requireCMake) { 77 if (requireCMake) {
78 String cmakePath = getSDKPath() + "/cmake/bin" 78 String cmakePath = getSDKPath() + "/cmake/bin"
79 if (!file(cmakePath).exists()) { 79 if (!file(cmakePath).exists()) {
80 throw new GradleScriptException("cmake not found! Please install the android SDK version" + 80 logger.warn("cmake not found! Please install the android SDK version of cmake.");
81 " of cmake.", null);
82 } 81 }
83 if (!path.contains(cmakePath)) { 82 if (!path.contains(cmakePath)) {
84 path = cmakePath + ":" + path 83 path = cmakePath + ":" + path
85 } 84 }
86 } 85 }
87 86
88 return path 87 return path
89 } 88 }
90 89
91 def constructBuildCommand(variant, buildTarget) { 90 def constructBuildCommand(variant, buildTarget) {
(...skipping 15 matching lines...) Expand all
107 106
108 if (deviceType != null) { 107 if (deviceType != null) {
109 cmdLine += " -d " + deviceType 108 cmdLine += " -d " + deviceType
110 } 109 }
111 110
112 if (variant.name.endsWith("Release")) { 111 if (variant.name.endsWith("Release")) {
113 cmdLine += " --release" 112 cmdLine += " --release"
114 } 113 }
115 return cmdLine 114 return cmdLine
116 } 115 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698