I've submitted the merge (106 projects!), and I believe that the tree is in the state that it should be.
Caveats: -THE BUILD IS BROKEN. You've been warned. There's been some drift around OpenCORE (probably situations where new code was written in cupcake that uses OpenCORE 1, or where APIs were removed in cupcake that OpenCORE 2 relies on). The proper command to try to merge the OpenCORE code should be "git merge remotes/korg/cupcake" (I'm typing from memory). -I'm not 100% sure that the server contains exactly what it should. I've had a filesystem failure right as I was trying to verify it, and I'm not gonna be able to verify until at least sometime tomorrow. JBQ On Wed, Mar 18, 2009 at 12:43 PM, Jean-Baptiste Queru <j...@android.com> wrote: > I expect to start submitting the changes in about an hour, i.e. > between 1:30pm and 2pm PDT. > > Starting right now, you may want to avoid initiating a new repo sync, > unless you're OK ending up with a tree that might not even compile. > > JBQ > > On Tue, Mar 17, 2009 at 6:35 PM, Jean-Baptiste Queru <j...@android.com> wrote: >> [bcc android-platform, android-framework, android-porting] >> >> I'm working on merging the latest cupcake code drop into master. The >> task is quite hairy, so the following two guidelines probably apply: >> >> -please don't submit anything in gerrit, as you'll just get in my way. >> -now is a good time to repo sync master, as I'm going to have to >> submit the result of the merge in a state where it doesn't build, and >> I have no idea how long it'll take to get it to build again after >> that. >> >> Thanks, >> JBQ >> >> -- >> Jean-Baptiste M. "JBQ" Queru >> Android Engineer, Google. >> >> Questions sent directly to me that have no reason for being private >> will likely get ignored or forwarded to a public forum with no further >> warning. >> > > > > -- > Jean-Baptiste M. "JBQ" Queru > Android Engineer, Google. > > Questions sent directly to me that have no reason for being private > will likely get ignored or forwarded to a public forum with no further > warning. > -- Jean-Baptiste M. "JBQ" Queru Android Engineer, Google. Questions sent directly to me that have no reason for being private will likely get ignored or forwarded to a public forum with no further warning. --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "android-framework" group. To post to this group, send email to android-framework@googlegroups.com To unsubscribe from this group, send email to android-framework+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/android-framework?hl=en -~----------~----~----~----~------~----~------~--~---
