[tlug] Git challenged (maintaining an Android build)

[Shawn Brown <javajunkie@example.com>]

Hi,

I want to build Android from source overtime as it changes.  I also
need to add in the Google applications that I can pull from my phone
now but aren't in the Android source (there is other proprietary stuff
for the camera and audio etc that isn't in source).

How can I do that in Git.  I really don't have my head around this.

To build for the Google Ion now, I've had to use a 3rd parties
repository as android is only set up to build for the G1.  Using a
local_manifest.xml and then running repo sync seems to work well.

Should I put files I want to add into my own repository and then just
sync it.  Or should I put stuff in a branch and just merge it after
looking at the diffs and confirming it's doing what I want.  I
probably won't be committing.

I'm on the cupcake branch now but when things go over to donut, then
I'll need to reapply the same changes to build files and include the
same packages for addition.

Sorry if this seems like a simple question but even after reading how
people advise using branches to select just the essential of something
they developed, I'm not sure in a simple case like mine if that is the
best.  I mean I'm going to have uncommitted stuff when/if I go to
switch branches.

By the way, I'm building on a .dmg, so if I had a repository, I could
just put the current .dmg on a back up, load a new dmg with a new
branch and sync with my repository of changes.

Maybe either way is fine with not that much difference.  If you have a
suggestion you think I should try, please let me know.

Shawn