What is the difference between in master branch vs other branches?

[spencer]

I am trying to download an compile aosp and I was wondering what is
the difference between the master branch:


$ repo init -u https://android.googlesource.com/platform/manifest


and other branches such as:


$ repo init -u https://android.googlesource.com/platform/manifest -b
android-4.0.1_r1


Thanks

[Jean-Baptiste Queru]

At a high level, master is the AOSP bleeding edge. It's always a
development branch, i.e. it has the fewest restrictions on making
changes.

One notch away, there are development branches for the named versions
(e.g. ics-mr1). Making changes there is highly restricted, but
possible in exceptional cases.

One more notch away, there are tagged versions (e.g. 4.0.1_r1). Those
aren't meant to ever change.

At the moment, for the purpose of building, master can be built on
Ubuntu 11.10, and on MacOS 10.7 with XCode 4, whereas older branches
require older environments.

JBQ

> --
> You received this message because you are subscribed to the "Android Building" mailing list.
> To post to this group, send email to android-...@googlegroups.com
> To unsubscribe from this group, send email to
> android-buildi...@googlegroups.com
> For more options, visit this group at
> http://groups.google.com/group/android-building?hl=en

--
Jean-Baptiste M. "JBQ" Queru
Software Engineer, Android Open-Source Project, Google.

Questions sent directly to me that have no reason for being private
will likely get ignored or forwarded to a public forum with no further
warning.

[spencer]

So if I build the AOSP master branch on my mac 10.7 w/ xcode 4 it will
build successfully without any patches or other work arounds I have to
do?

On Jan 13, 1:04 pm, Jean-Baptiste Queru <j...@android.com> wrote:
> At a high level, master is the AOSP bleeding edge. It's always a
> development branch, i.e. it has the fewest restrictions on making
> changes.
>
> One notch away, there are development branches for the named versions
> (e.g. ics-mr1). Making changes there is highly restricted, but
> possible in exceptional cases.
>
> One more notch away, there are tagged versions (e.g. 4.0.1_r1). Those
> aren't meant to ever change.
>
> At the moment, for the purpose of building, master can be built on
> Ubuntu 11.10, and on MacOS 10.7 with XCode 4, whereas older branches
> require older environments.
>
> JBQ
>
>
>
>
>
>
>
>
>
> On Fri, Jan 13, 2012 at 12:29 PM, spencer <spencershw...@gmail.com> wrote:
> > I am trying to download an compile aosp and I was wondering what is
> > the difference between the master branch:
>

> > $ repo init -uhttps://android.googlesource.com/platform/manifest

[Jean-Baptiste Queru]

Yes, master will build on your environment. However, unfortunately,
the emulator will not work. You'll either need to use an emulator that
was built on another environment (e.g. from the SDK) or to flash a
device.

JBQ

[othy74]

On Jan 13, 10:04 pm, Jean-Baptiste Queru <j...@android.com> wrote:
> At a high level, master is the AOSP bleeding edge. It's always a
> development branch, i.e. it has the fewest restrictions on making
> changes.
>
> One notch away, there are development branches for the named versions
> (e.g. ics-mr1). Making changes there is highly restricted, but
> possible in exceptional cases.

Does Gerrit log all of those changes?

https://android-review.googlesource.com/#/q/status:merged,n,z

Does this web site provide a complete picture of the changes that will
arrive when running repo sync (against master) again?

[Jean-Baptiste Queru]

The Gerrit instance for AOSP only lists changes that are reviewed on
it. Changes that are reviewed on other instances don't get listed
there.

In theory, it's possible to just use naked git commands to do that.
Ignoring manifest changes and fetch errors, this probably does the
trick:

repo forall -pc 'git fetch -q
https://android.googlesource.com/$REPO_PROJECT $REPO_RREV ; git log
$REPO_LREV..FETCH_HEAD'

JBQ

[othy74]

> repo forall -pc 'git fetch -q
> https://android.googlesource.com/$REPO_PROJECT $REPO_RREV ; git log
> $REPO_LREV..FETCH_HEAD'

Very useful. Thank you.