What is difference between git source "froyo-release" and "master"??

93 views
Skip to first unread message

steel

unread,
Jul 7, 2010, 7:04:19 AM7/7/10
to Android Building
HI,i am newbie on android, so if I asked some silly question, please
forgive me T_T

my question is : which branch is "LATEST-STABLE" of 2.2 code ? "froyo-
release" or "master"?
..........................................................................................................................................................................................................
today I repo code from git://android.git.kernel.org/platform/manifest.git

mkdir mydroid
cd mydroid
repo init -u git://android.git.kernel.org/platform/manifest.git
repo sync
make
============================================
PLATFORM_VERSION_CODENAME=AOSP
PLATFORM_VERSION=AOSP
TARGET_PRODUCT=generic
TARGET_BUILD_VARIANT=eng
TARGET_SIMULATOR=
TARGET_BUILD_TYPE=release
TARGET_BUILD_APPS=
TARGET_ARCH=arm
HOST_ARCH=x86
HOST_OS=linux
HOST_BUILD_TYPE=release
BUILD_ID=OPENMASTER
============================================


i notice this banch of code need jdk 1.6 not 1.5, and must build on
x86_64

later I notice there are "* [new branch] froyo-release -> korg/froyo-
release" during sync process

so I cancel make, remove code, repo code again with "-b froyo-release"

mkdir mydroid
cd mydroid
repo init -u git://android.git.kernel.org/platform/manifest.git -b
froyo-release
repo sync
make
root@client:~/src# make
============================================
PLATFORM_VERSION_CODENAME=REL
PLATFORM_VERSION=2.2
TARGET_PRODUCT=generic
TARGET_BUILD_VARIANT=eng
TARGET_SIMULATOR=
TARGET_BUILD_TYPE=release
TARGET_BUILD_APPS=
TARGET_ARCH=arm
HOST_ARCH=x86
HOST_OS=linux
HOST_BUILD_TYPE=release
BUILD_ID=MASTER
============================================

NOTE: "froyo-release" just need jdk 1.5

Jean-Baptiste Queru

unread,
Jul 7, 2010, 1:42:36 PM7/7/10
to android-...@googlegroups.com
At the scale of the entire Android Open-Source Project, the latest
stable release is the tagged android-2.2_r1.1, which is build FRF91.
This is what you should be using as a starting point when building a
consumer device (or a newer version if there's one).

There is no project-wide froyo-release branch, that branch is only
present in individual projects as an implementation detail because
git/repo needs it in order to be able to sync the tagged releases. You
shouldn't be able to successfully run "repo init -b froyo-release".
The state of froyo-release across individual projects isn't guaranteed
to match a stable state.

The froyo branch contains all the changes that are present in the
froyo-release branch, plus a few additional ones.

The master branch is the one that we accept contributions against
(we're not generally equipped to accept changes in froyo, except in
the CTS project). It's approximately froyo plus all the contributions
submitted so far. This is what you should be using when contributing
to the Android Open-Source Project.

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.

Reply all
Reply to author
Forward
0 new messages