On 23 March 2013 17:38, Bernhard Rosenkränzer <bernhard.rosenkranzer@linaro.org> wrote:

Hi,

On 23 March 2013 05:36, Vishal Bhoj <vishal.bhoj@linaro.org> wrote:

Bero,

Do we need these 2 manifest:

default.xml

linaro-default.xml

default.xml is the AOSP manifest, linaro-default.xml is the AOSP manifest + some changes to pull in Linaro trees.

I think linaro-default.xml can be obsoleted because tracking.xml essentially replaces it, there's no build that uses it.

As for default.xml, we may want to just rename tracking.xml to default.xml -- that's essentially what it is (our version of the file found upstream).

That would also allow us to "git merge android-4.3_r1" even in platforms/manifest, and it would allow repo to do the right thing without a -m flag.

That was the next logical step to do. Lets do it at the beginning of next cycle.

ttyl
bero