Last Comment Bug 721271 - Post-0.3 Android Sync Aurora uplift
: Post-0.3 Android Sync Aurora uplift
Product: Android Background Services
Classification: Client Software
Component: Android Sync (show other bugs)
: unspecified
: ARM Android
-- normal
: ---
Assigned To: Richard Newman [:rnewman]
Depends on: 716760 720933
  Show dependency treegraph
Reported: 2012-01-25 17:00 PST by Richard Newman [:rnewman]
Modified: 2013-04-04 13:48 PDT (History)
2 users (show)
See Also:
Crash Signature:
QA Whiteboard:
Iteration: ---
Points: ---

Makefile fixes for Aurora drop. v1 (3.11 KB, patch)
2012-01-25 19:28 PST, Richard Newman [:rnewman]
akeybl: approval‑mozilla‑aurora+
Details | Diff | Splinter Review

Description User image Richard Newman [:rnewman] 2012-01-25 17:00:39 PST
Gonna need a big snapshot. Preparing…
Comment 1 User image Richard Newman [:rnewman] 2012-01-25 19:26:03 PST
A local build of the following queue produces a working Fennec 11.0a2 build on my machine.

The first item is a landing of Bug 710448, so we can skip over that.

  Bug 710448 - Rewritten Sync record reconciling to handle edge cases; r=rnewman, r=philikon, a=akeybl

The next five patches are the first preffed-off m-c landing. Some Makefile hackery was required to get these to apply.

  Bug 709391 - Part 1: implement in-Fennec Android Sync shipping solution. r=blassey, a=akeybl
  Bug 709391 - Part 2: l10n build changes to include Sync strings. r=blassey, f=Pike, a=akeybl
  Bug 709391 - Part 3: Makefile changes to preprocess sync_syncadapter.xml. r=blassey, a=akeybl
  Bug 709391 - initial import of Android Sync code (Git tag: v0.1.2-fixes). a=java-only, a=akeybl
  Bug 709391 - hide Sync setup task in Launcher, make syncs return immediately. a=java-only, a=akeybl

The next patch is some of Brad's Makefile work. Again, this needed a little effort to apply.

  Bug 712380 - Add support for clobbering the Android resources when needed. r=dougt, a=akeybl

The remaining patches are from today's 0.3 landing. I did a straight-up code drop to avoid any problems with missed files, rather than importing the patch I actually landed.

  Bug 709660 - correctly process resolution-specific Sync resources. r=mbrubeck, r=rnewman, a=akeybl
  Bug 718928 - AndroidManifest.xml does not depend on Sync manifest include fragments. r=ted, a=akeybl
  Bug 721271 - Post-0.3 Android Sync Aurora uplift. a=akeybl

Finally, there was some fixing-up needed in the final Makefile to get it to match more closely the m-c Makefile. Apparently hg continues to suck at merges, because our source dependencies weren't being built.

  Bug 721271 - Makefile fixes for Aurora landing. a=akeybl

I will attach the final Makefile tweaks for review, and as a place to hang an Aurora request.
Comment 2 User image Richard Newman [:rnewman] 2012-01-25 19:28:02 PST
Created attachment 591686 [details] [diff] [review]
Makefile fixes for Aurora drop. v1

[Approval Request Comment]
User impact if declined: 
  No Sync.

Testing completed (on m-c, etc.): 
  Green build and tests on m-c.
  Manual testing of local Aurora build.
  QA of Try build of m-c drop.

Risk to taking this patch (and alternatives if risky):
  Delayed or missed Aurora uptake of Sync.
Comment 3 User image Alex Keybl [:akeybl] 2012-01-25 20:13:29 PST
Comment on attachment 591686 [details] [diff] [review]
Makefile fixes for Aurora drop. v1

[Triage Comment]
Awesome - we're ready for our first sync drop on aurora! Approved

Note You need to log in before you can comment on or make changes to this bug.