Bug 1385695 - Propagate "app" debug/release build type to dependencies. r=sebastian

Even when building the "app" module in debug mode, by default Gradle still chooses to build all dependencies in release mode, which means that all of our own source files that reside in such a library (geckoview, respectively thirdparty) will e.g. be missing debug info for local variables.

MozReview-Commit-ID: owZr9yKtYI

--HG--
extra : rebase_source : ae09795ebe70bf4213cd3d145efa355712c702a0
This commit is contained in:
Jan Henning 2017-07-30 13:55:11 +02:00
Родитель 7e1a1b0496
Коммит bf6a3ea142
4 изменённых файлов: 16 добавлений и 3 удалений

Просмотреть файл

@ -262,8 +262,12 @@ dependencies {
officialCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta1'
testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta1'
compile project(':geckoview')
compile project(':thirdparty')
// With a simple "compile", Gradle will always build these libraries in their default configuration
// (i.e. release), so we need to explicitly forward our own build configuration here (bug 1385695).
debugCompile project(path: ':geckoview', configuration: "debug")
releaseCompile project(path: ':geckoview', configuration: "release")
debugCompile project(path: ':thirdparty', configuration: "debug")
releaseCompile project(path: ':thirdparty', configuration: "release")
testCompile 'junit:junit:4.12'
testCompile 'org.robolectric:robolectric:3.1.2'

Просмотреть файл

@ -9,6 +9,9 @@ android {
buildToolsVersion project.ext.buildToolsVersion
defaultConfig {
defaultPublishConfig 'release'
publishNonDefault true
targetSdkVersion project.ext.targetSdkVersion
minSdkVersion project.ext.minSdkVersion
manifestPlaceholders = project.ext.manifestPlaceholders

Просмотреть файл

@ -46,7 +46,10 @@ dependencies {
// "Conflict with dependency 'com.android.support:support-annotations'. Resolved versions for app (23.4.0) and test app (23.1.1) differ."
androidTestCompile 'com.android.support:support-annotations:23.4.0'
compile project(':geckoview')
debugCompile project(path: ':geckoview', configuration: "debug")
releaseCompile project(path: ':geckoview', configuration: "release")
withGeckoBinariesCompile project(path: ':geckoview', configuration: "withGeckoBinaries")
withoutGeckoBinariesCompile project(path: ':geckoview', configuration: "withoutGeckoBinaries")
}
apply from: "${topsrcdir}/mobile/android/gradle/with_gecko_binaries.gradle"

3
mobile/android/thirdparty/build.gradle поставляемый
Просмотреть файл

@ -7,6 +7,9 @@ android {
buildToolsVersion project.ext.buildToolsVersion
defaultConfig {
defaultPublishConfig 'release'
publishNonDefault true
targetSdkVersion project.ext.targetSdkVersion
minSdkVersion project.ext.minSdkVersion
manifestPlaceholders = project.ext.manifestPlaceholders