Merge fx-team to m-c. a=merge

This commit is contained in:
Ryan VanderMeulen 2016-03-13 19:03:33 -04:00
commit 7b3609707c

View File

@ -101,6 +101,11 @@ android {
exclude 'org/mozilla/gecko/adjust/AdjustHelper.java'
}
if (!mozconfig.substs.MOZ_ANDROID_GCM) {
exclude 'org/mozilla/gecko/gcm/**/*.java'
exclude 'org/mozilla/gecko/push/**/*.java'
}
srcDir "${project.buildDir}/generated/source/preprocessed_code" // See syncPreprocessedCode.
}
@ -127,6 +132,11 @@ android {
test {
java {
srcDir "${topsrcdir}/mobile/android/tests/background/junit4/src"
if (!mozconfig.substs.MOZ_ANDROID_GCM) {
exclude 'org/mozilla/gecko/gcm/**/*.java'
exclude 'org/mozilla/gecko/push/**/*.java'
}
}
}