On Wednesday, December 11, 2013 9:50:36 PM UTC+5:30, Subodh Nijsure wrote: > > Hi, > > Not specifically code "porting" question but more question of managing > local changes to AOSP repo for specific hardware platforms. > > We are porting AOSP to our custom hardware and we need to maintain our > changes in our local repository. Our baseline code comes from > code-aurora project for Qualcomm chips. Unfortunately our changes are > hardware specific and folks maintaining code-aurora will see no value > in allowing us to push those changes upstream. > > Is there a good document that describes, recommends workflow for > cloning the AOSP repo, local commit & push so changes can be shared > across a team of engineers? > > Or if you follow some kind of process in your team environment for > maintaining local changes to AOSP tree please send it my way, would > much appreciate it. > > -Subodh >
I can think of two approaches: 1: Use a custom manifest.xml with its own git. Here you need to maintain separate git projects only for the ones you have modified and use the upstream ones for all others. e.g Linaro android http://android.git.linaro.org/gitweb?p=platform/manifest.git;a=blob;f=default.xml;h=74717e5a2274a5f7ec6424adb602d3c032edaca5;hb=refs/heads/linaro_android_4.4.2 2: Use the local_manifest overlay. Here you do the repo init with the upstream manifest. The entries in the local_manifest override the ones from upstream manifest. I use this for my personal work: https://gitorious.org/aosp-bbb/local_manifest/source/14a1102deb5f64734ee337c82dca8c9a71c3a1f8: Read the repo documentation for more details: https://android.googlesource.com/tools/repo/+/e7a3bcbbb8083e812ce07a5459f0e6d30edfb9fe/docs/manifest_xml.txt Both approaches need you to maintain your own git trees for the modified projects. The first approach seems more common for bigger projects. Also, you may explore setting up a local mirror for the sources to avoid each team member downloading separately from internet. http://s.android.com/source/downloading.html#using-a-local-mirror -Vishveshwar -- -- unsubscribe: android-porting+unsubscr...@googlegroups.com website: http://groups.google.com/group/android-porting --- You received this message because you are subscribed to the Google Groups "android-porting" group. To unsubscribe from this group and stop receiving emails from it, send an email to android-porting+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
