[copied to group due to using reply not reply all first time] We've ended up with a forked repository at the moment. The main problem with post checkout patching (or file copying) is that repo will then refuse to update the files due to detecting local changes.
The ideal system would allow us to continue to use repo to keep the checked out tree up to date and apply the required changes during a build so we can keep all our changes in the vendor/xxx tree. Is that possible with the current build system? Al. -- * Looking for Android Apps? - Try http://andappstore.com/ * ====== Funky Android Limited is registered in England & Wales with the company number 6741909. The views expressed in this email are those of the author and not necessarily those of Funky Android Limited, it's associates, or it's subsidiaries. On 21 Aug 2010, at 01:47, Dianne Hackborn wrote: > I would think it would be much easier to maintain a patch on top of the > platform code rather than trying to replace source files. What do you do > when the platform's source changes to fix bugs or add features? A patch you > can rebase... a separate source that is a copy of an earlier version of the > platform's source seems worse. > > On Fri, Aug 20, 2010 at 11:43 AM, Jim Ancona <[email protected]> wrote: > On Aug 19, 8:55 am, Al Sutton <[email protected]> wrote: > > Does anyone know if there is a equivalent for code? > > AFAIK, the only way to do this is to fork the relevant repository and > then continue to merge changes from upstream. We have a similar > problem with the Android on Freerunner project (mapping Android > buttons to hardware that doesn't really support them), so if there's a > better way, I'd love to hear about it too. > > Jim > > > > > I'm working with some people on a Froyo port to the Archos 5 IT, which, > > although it ships with Android, doesn't have the home, menu, and back > > buttons so we've had to implement them in the status bar. In order to do > > this we've needed some code changes to frameworks/base, so it would be > > great if someone could point me at a method of doing a vendor overlay for > > the java sources (and yes, I've tried including the code in the overlay > > file, and unfortunately it doesn't work). > > > > Thanks, > > > > Al. > > -- > > > > * Looking for Android Apps? - Tryhttp://andappstore.com/* > > > > ====== > > Funky Android Limited is registered in England & Wales with the company > > number 6741909. > > > > The views expressed in this email are those of the author and not > > necessarily those of Funky Android Limited, it's associates, or it's > > subsidiaries. > > > > On 19 Aug 2010, at 00:01, Robert Greenwalt wrote: > > > > > > > > > you will need to set the PRODUCT_PACKAGE_OVERLAYS build time var in your > > > product defining makefile. This should be set to the relative path of > > > your overlay dir. The overlay dir contains a sparse mirror of the source > > > tree with just the resource files you wish to overlay. > > > > > For example, from the root of your dev tree: > > > framework/base/core/res/res/values/config.xml - the real file in with all > > > the other src files > > > vendor/foo/product/MyProduct.mk (includes PRODUCT_PACKAGE_OVERLAYS := > > > vendor/foo/myoverlay) > > > vendor/foo/myoverlay/framework/base/core/res/res/values/config.xml - the > > > overlay copy, may only have this one file in myoverlay > > > > > You should not modify the base/core/res makefile. > > > > > R > > > > > On Wed, Aug 18, 2010 at 10:12 AM, Naseer <[email protected]> wrote: > > > Thank you -- Can you please point me to any documentation on how to do > > > the overlay ? > > > I am assuming it will use make variables defined in device/$VENDOR./ > > > $TARGET_PRODUCT > > > Will this also involve modifying the makefile in frameworks/base/core/ > > > res ? > > > > > On Aug 18, 8:48 pm, Robert Greenwalt <[email protected]> wrote: > > > > The build system provides an overlay feature that can be used for this. > > > > It > > > > gives aapt one or more overlay paths that get used to modify the base > > > > resource file (config.xml in your case). The config.xml that would > > > > exist in > > > > the overlay dir would only need to contain the values that you want to > > > > change. > > > > > > R > > > > > > On Wed, Aug 18, 2010 at 4:59 AM, Naseer <[email protected]> wrote: > > > > > Hi, > > > > > I want to override values in frameworks/base/core/res/res/values/ > > > > > config.xml based on the target product. > > > > > What is the best method to override only selected values from them ? > > > > > I do not want to directly change the xml files do avoid conflicts with > > > > > other targets and to avoid maintenance issues. > > > > > > > Thanks, > > > > > -Naseer > > > > > > > -- > > > > > unsubscribe: > > > > > [email protected]<android-porting%2Bunsubscribe@ > > > > > googlegroups.com> > > > > > website:http://groups.google.com/group/android-porting-Hide quoted > > > > > text - > > > > > > - Show quoted text - > > > > > -- > > > unsubscribe: [email protected] > > > website:http://groups.google.com/group/android-porting > > > > > -- > > > unsubscribe: [email protected] > > > website:http://groups.google.com/group/android-porting > > -- > unsubscribe: [email protected] > website: http://groups.google.com/group/android-porting > > > > -- > Dianne Hackborn > Android framework engineer > [email protected] > > Note: please don't send private questions to me, as I don't have time to > provide private support, and so won't reply to such e-mails. All such > questions should be posted on public forums, where I and others can see and > answer them. > > > -- > unsubscribe: [email protected] > website: http://groups.google.com/group/android-porting -- unsubscribe: [email protected] website: http://groups.google.com/group/android-porting
