Bug 1207714 - DO NOT LAND - Enable debugging and running Robolectric tests.
MozReview-Commit-ID: Dc5jhLP5Csf
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -984,16 +984,19 @@ pref("dom.vr.enabled", true);
pref("browser.tabs.showAudioPlayingIcon", true);
pref("dom.serviceWorkers.enabled", true);
pref("dom.serviceWorkers.interception.enabled", true);
// Enable DOM push API in Nightly Fennec.
#ifdef NIGHTLY_BUILD
pref("dom.push.enabled", true);
+pref("dom.push.debug", true);
+pref("dom.push.loglevel", "debug");
+pref("dom.push.serverURL", "https://updates-autopush-dev.stage.mozaws.net/v1/gcm/829133274407");
#endif
// The remote content URL where FxAccountsWebChannel messages originate. Must use HTTPS.
pref("identity.fxaccounts.remote.webchannel.uri", "https://accounts.firefox.com");
// The remote URL of the Firefox Account profile server.
pref("identity.fxaccounts.remote.profile.uri", "https://profile.accounts.firefox.com/v1");
--- a/mobile/android/app/omnijar/build.gradle
+++ b/mobile/android/app/omnijar/build.gradle
@@ -10,16 +10,17 @@ apply plugin: 'java'
// while the latter is more general. That means its easy to convert this list
// into inputs for :app, but not vice-versa. Sadly this implies that :app
// evaluation depends on :omnijar, but the evaluation overhead is low enough
// that we accept it.
sourceSets {
main {
// Depend on the Gecko resources in mobile/android.
resources {
+ srcDir "${topsrcdir}/dom/push"
srcDir "${topsrcdir}/mobile/android/chrome"
srcDir "${topsrcdir}/mobile/android/components"
srcDir "${topsrcdir}/mobile/android/locales"
srcDir "${topsrcdir}/mobile/android/modules"
srcDir "${topsrcdir}/mobile/android/themes"
srcDir "${topsrcdir}/toolkit"
}
}
--- a/mobile/android/services/src/main/java/org/mozilla/gecko/background/common/GlobalConstants.java
+++ b/mobile/android/services/src/main/java/org/mozilla/gecko/background/common/GlobalConstants.java
@@ -46,32 +46,32 @@ public class GlobalConstants {
* <http://docs.aws.amazon.com/ElasticLoadBalancing/latest/DeveloperGuide/elb-security-policy-table.html>
*/
public static final String[] DEFAULT_CIPHER_SUITES;
public static final String[] DEFAULT_PROTOCOLS;
static {
// Prioritize 128 over 256 as a tradeoff between device CPU/battery and the minor
// increase in strength.
- if (Versions.feature20Plus) {
+ if (false && Versions.feature20Plus) {
DEFAULT_CIPHER_SUITES = new String[]
{
"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", // 20+
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", // 20+
"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256", // 20+
"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA", // 11+
"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", // 20+
"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384", // 20+
"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA", // 11+
// For Sync 1.1.
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA", // 9+
"TLS_RSA_WITH_AES_128_CBC_SHA", // 9+
};
- } else if (Versions.feature11Plus) {
+ } else if (false && Versions.feature11Plus) {
DEFAULT_CIPHER_SUITES = new String[]
{
"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA", // 11+
"TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA", // 11+
"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA", // 11+
// For Sync 1.1.
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA", // 9+