[reviving the thread] Hi,
What about the Day of Reckoning is coming? :) I have a couple of questions on procedure of tackling the patch transferring process from Android to Harmony. Given both Android classlib and Harmony classlib licensed under APLv2, the licenses are compatible. Harmony policy is to have ACQ and ICLA signed for each contributor. 1. Can anyone who signed both ACQ/ICLA check out the Android trunk and make the patches? 2. Or, should someone from Android staff sign the ACQ and ICLA? 3. Or, should we ask Android to make a one-time contribution of source code? I volunteer to publish the diffs between Android's classlib and Harmony, but we need to clarify these legal issues first. As the background: as Android uses the classlib from 2007-04-11, there some technical difficulty -- the Harmony classlib was updated a lot :) "Android vs. Harmony-2007-04-11": (line counts): 67689 total lines to merge 735 annotation.diff 2272 archive.diff 18 auth.diff 197 concurrent.diff 178 crypto.diff 2043 logging.diff 22494 luni.diff 8951 luni-kernel.diff 7948 math.diff 459 nio_char.diff 1820 nio.diff 2434 prefs.diff 7625 regex.diff 29 security.diff 743 security-kernel.diff 1021 sql.diff 574 suncompat.diff 6542 text.diff 1606 x-net.diff "Harmony -2007-04-11 vs Harmony-HEAD": (line counts): 184805 total lines of new code Android is probably missing ;) 994 annotation.diff 14924 archive.diff 4287 auth.diff 1321 concurrent.diff 1428 crypto.diff 6077 logging.diff 77396 luni.diff 2589 luni-kernel.diff 4613 math.diff 6283 nio_char.diff 4763 nio.diff 1757 prefs.diff 4192 regex.diff 19764 security.diff 565 security-kernel.diff 17193 sql.diff 635 suncompat.diff 8029 text.diff 7995 x-net.diff Thanks, Aleksey. On Fri, Oct 24, 2008 at 10:25 PM, Dan Bornstein <[email protected]> wrote: > On Fri, Oct 24, 2008 at 12:16 AM, Mark Hindess > <[email protected]> wrote: >>> In the coming months, expect to see us working on merging changes in >>> both directions. In the mean time, please do poke around in our code, >>> and, should you be inspired to do so, we'd be tickled pink if you >>> wanted either to pull changes from us or submit patches back. We're >>> just getting ramped up on operating in the open, so I apologize in >>> advance for the inevitable hiccups. >> >> It might be useful to know what revision(s) of Harmony code, the >> equivalent modules in your repository are based on. Then it would be >> easier for people to figure out where significant improvements have been >> made. > > You may groan at the answer: We took a snapshot of the Harmony > tip-of-tree code on 2007-04-11, and used that to augment the code we > already had at the time (as opposed to replace our original code en > masse). We later also selectively took updated files from Harmony, > when it looked like there was significant progress (e.g., a module > became complete or had a major overhaul). And we fixed a lot of bugs > ourselves. > > All that being said, knowing that the Day Of Reckoning would someday > come, we did try to make it reasonably easy to figure out where all > the files came from and what intentional changes we made to Harmony > code: First of all, the license headers for Harmony files are > different than the headers for files that were made from scratch for > Android. Also, we tried to explicitly mark every Harmony file we > changed, mostly by marking added, changed, or removed code inline > (grep for "// BEGIN android"), though we sometimes resorted to a > general note at the top of file (e.g., when we overhauled the > documentation for a class). > > Regards, > > -dan >
