Skip to content

Commit

Permalink
Bug 1255227 - Part 1: Stop using deprecated android-sdk-manager Gradl…
Browse files Browse the repository at this point in the history
…e plugin. r=sebastian

This was only ever used to automatically fetch Android SDK
dependencies in the android-gradle-dependencies job in Task Cluster.
That function is now provided by newer Android-Gradle build plugins.

MozReview-Commit-ID: Adrxm2rAPlZ

--HG--
extra : rebase_source : 6cccb53e2ebc2642ee6c61ef13fcb6d8321b67cf
  • Loading branch information
ncalexan committed Jul 18, 2017
1 parent 4a766e7 commit 7c0822f
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 4 deletions.
3 changes: 1 addition & 2 deletions build.gradle
Expand Up @@ -47,7 +47,7 @@ buildscript {
url repository
}
}
// For android-sdk-manager SNAPSHOT releases.
// For dexcount-gradle-plugin and other in tree plugins.
maven {
url "file://${gradle.mozconfig.topsrcdir}/mobile/android/gradle/m2repo"
}
Expand All @@ -60,7 +60,6 @@ buildscript {
exclude module: 'guava'
}
// Provided in tree.
classpath 'com.jakewharton.sdkmanager:gradle-plugin:1.5.0-SNAPSHOT'
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.1'
}
}
Expand Down
1 change: 0 additions & 1 deletion mobile/android/app/build.gradle
@@ -1,6 +1,5 @@
buildDir "${topobjdir}/gradle/build/mobile/android/app"

apply plugin: 'android-sdk-manager' // Must come before 'com.android.*'.
apply plugin: 'com.android.application'
apply plugin: 'checkstyle'
apply plugin: 'com.getkeepsafe.dexcount'
Expand Down
1 change: 0 additions & 1 deletion mobile/android/geckoview/build.gradle
@@ -1,6 +1,5 @@
buildDir "${topobjdir}/gradle/build/mobile/android/geckoview"

apply plugin: 'android-sdk-manager' // Must come before 'com.android.*'.
apply plugin: 'com.android.library'

def VERSION_NAME = '0.0.1'
Expand Down

0 comments on commit 7c0822f

Please sign in to comment.