Bug 1424967: Fix remaining lint error in upload_symbols.py; r=ted.mielczarek MozReview-Commit-ID: LsvBXNy1SA6

Bug 1424967: Pass the correct arguments to log in upload_symbols.py; r=ted.mielczarek MozReview-Commit-ID: JcicOipqM4Q

Bug 1420722: Just use GetInFlowParent for now. r=mattwoodrow display: contents is about to ship in other engines, let's prevent subtle bugs. MozReview-Commit-ID: C8saQnRvRuI

servo: Merge #19787 - style: Make GeckoElement::has_class faster (from emilio:opt-has-class); r=bholley By force-inlining the fast path, and pulling out a branch that rust didn't manage to pull out. Source-Repo: https://github.com/servo/servo Source-Revision: 1ac35dc7abd0b984838dfa4be581a319158190a5

Bug 1430322 - Update expiration for PREDICTOR_PREFETCH_{DECISION,IGNORE}_REASON. r=valentin MozReview-Commit-ID: DagMyj8zxg2

Backed out 7 changesets (bug 1419581) for B bustage on /builds/worker/workspace/build/src/widget/android/nsWindow.h:0 on a CLOSED TREE Backed out changeset 1af5a54e829d (bug 1419581) Backed out changeset c9aef37de282 (bug 1419581) Backed out changeset 8d0855cb17b7 (bug 1419581) Backed out changeset d0eba5853ab6 (bug 1419581) Backed out changeset bc4cda1cc57c (bug 1419581) Backed out changeset 93547276fba8 (bug 1419581) Backed out changeset 45b5309a73cb (bug 1419581)

Merge mozilla-central to autoland. a=merge CLOSED TREE

Bug 1430037 - Use sparse checkouts for docker image builds. r=dustin In many cases, building docker images starts on machines that don't have a cached checkout, and it often takes forever to get a full clone. It used to be worsened when 3 jobs could run at the same time because the worker would start up clean, and 3 jobs would be doing a mercurial clone at the same time, thrashing I/O, but that part is fortunately fixed. It is still, however, appreciable not to waste time in the mercurial clone part of image creation.

Bug 1430037 - Use the in-tree image builder image to build docker images. r=dustin The image builder image we use to build docker images is updated manually, and not necessarily when changes occur in tree that should be reflected by a new image builder image. For instance, its run-task is currently outdated. Not enough that it's actually a problem, but it could rapidly become a problem. There is also a lot of friction when trying to make changes in how docker images are built, and while last time I tried, I ended up not being able to do the changes I wanted to make because the docker version on the host is too old, but this is already the second time I've been trying to make things better and hit a wall because the the image builder is essentially fixed in stone on the docker hub. So with this change, we make all the docker images use the in-tree image builder image, except itself, obviously. That one uses the last version that was uploaded. We may want to update it at some point, but not doing so will only impact building the image builder image itself, not the other ones.

Bug 1430277 - Skip symbolstore.py test when building with --enable-strip. r=mshal

Bug 1419581 - Part 6: Add Android build configuration --without-google-play-services. r=dustin MozReview-Commit-ID: 526BCiQwlm6

Bug 1419581 - Part 5: Add --without-google-play-services. r=chmanchester Historically, we used MOZ_NATIVE_DEVICES to proxy for Google Play Services. (MOZ_NATIVE_DEVICES was the first GPS-consuming feature in Fennec.) With Python moz.configure, we can easily add the real top-level flag that distributions like F-Droid actually want, which is to build without (non-free) Google Play Services entirely. MozReview-Commit-ID: 7YJKw3G1lQA

Bug 1419581 - Part 4: Allow setting MOZ_ANDROID_GCM in mozconfig. r=chmanchester This also verifies that we have Google Play Services (via MOZ_NATIVE_DEVICES=1) if we ask to build with GCM. This was just an oversight earlier. MozReview-Commit-ID: BvJi7Sfo4pu

Bug 1419581 - Part 3: Guard PresentationMediaPlayer windows with MOZ_NATIVE_DEVICES. r=jchen MozReview-Commit-ID: 3ZlVUMufn2g

Bug 1419581 - Part 2: Guard media Fennec JNI primitives with MOZ_NATIVE_DEVICES. r=jchen MozReview-Commit-ID: 3NWZ6BL5Tlr

Bug 1419581 - Part 1: Simplify MMA GCM sender IDs logic. r=nechen Right now, the MMA glue is built into constants.jar. constants.jar is the home of preprocessed Java code; it's built very early in the build process and intended to be a tiny kernel of shared definitions. The fact that the MMA glue has to live there is just a sad consequence of the non-Gradle build system, which makes dependency injection difficult. Unfortunately, another consequence is that it's not possible to move reference org.mozilla.gecko.{gcm,push} in the MMA glue, because those packages are built after constants.jar. Instead, this patch lifts some of the logic into AppConstants, which is part of constants.jar. We had grown a twisty maze of indirection around the GCM sender IDs and it just wasn't necessary; this just lifts the static pieces up a level and removes a bunch of interface indirection. What surprises me is that asking Google's InstanceId.getToken for a GCM token with a "comma,separated,list" of GCM sender IDs works -- and indeed, has worked since we added the second MMA sender ID. I didn't expect that and can't explain it, but this doesn't change that logic and local testing (both of the existing APKs, and APKs with this modification) looks good. MozReview-Commit-ID: 3hObfAwNlPH *** a0c07e53 o draft Bug 1419581 - Part 1: Move MMA setGcmSenderID from MmaDelegate to MmaLeanplumImp. r=nechen MozReview-Commit-ID: A4hrk6pVqGW

Bug 1419581 - Pre: Add missing excludes when building without MOZ_NATIVE_DEVICES. r=nalexander MozReview-Commit-ID: BXNFBEs2017

bug 1263765 - remove nsIBadCertListener2 implementation from the add certificate exception dialog r=jcj This reworks the certificate-fetching portion of the add certificate exception dialog so as to not require a nsIBadCertListener2 implementation, which is deprecated. The solution is simple: use the onerror/onload callbacks on the XMLHttpRequest object to grab the appropriate information. MozReview-Commit-ID: IjNrNfYA28P

Bug 1430313 - Don't take brand.dtd from object directory. r=mshal This thorn in my side turns out to be unnecessary! For reasons unknown, brand.dtd is not localized for mobile/android/ in the way it is for browser/. That means we can just pull from the branding directory, which avoids a frustrating issue where single-locale repacks couldn't actually produce strings.xml since the subtle dependency on the branding directory being built first wasn't satisfied. MozReview-Commit-ID: CBBaxfj5lMW

Bug 1413089 - Fix intermittent browser_ext_themes_dynamic_getCurrent.js. r=mixedpuppy MozReview-Commit-ID: MylrmgEfz9