aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-04-20 09:09:05 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-04-20 09:09:05 -0700
commit52970cd00680520e6cd48310b79402382389b8f3 (patch)
treeeca75e3224c9b2f69a25bb826a42ceba76142a5a
parent0be5c913eefb220c62e048b5683dc5f830ce0149 (diff)
parent993d0b8855a038301bc28ff008f9060ef96219e6 (diff)
downloadsource.android.com-52970cd00680520e6cd48310b79402382389b8f3.tar.gz
Merge "Document how to build the master branch for devices."
-rw-r--r--src/source/building-devices.md22
1 files changed, 13 insertions, 9 deletions
diff --git a/src/source/building-devices.md b/src/source/building-devices.md
index b0ee88c3..906d5bb1 100644
--- a/src/source/building-devices.md
+++ b/src/source/building-devices.md
@@ -113,6 +113,10 @@ downloaded from
[Google's Nexus driver page](https://code.google.com/android/nexus/drivers.html),
which add access to additional hardware capabilities with non-Open-Source code.
+When a device is suppoted in the master branch, the binaries for the most
+recent numbered release are the ones that should be used in the master
+branch.
+
There are no official binaries for Nexus One, ADP2 or ADP1.
### Extracting the proprietary binaries ###
@@ -139,15 +143,15 @@ are described in the page about [Building](building.html).
The recommended builds for the various devices are available through
the lunch menu, accessed when running the `lunch` command with no arguments:
-Device | Branch | Build configuration
----------|--------------------|------------------------
-maguro | android-4.0.4_r1.1 | full_maguro-userdebug
-panda | master | full_panda-userdebug
-wingray | android-4.0.4_r1.1 | full_wingray-userdebug
-crespo | android-4.0.4_r1.1 | full_crespo-userdebug
-passion | android-2.3.7_r1 | full_passion-userdebug
-sapphire | android-2.2.3_r1 | full_sapphire-userdebug
-dream | android-2.2.3_r1 | full_dream-userdebug
+Device | Branch | Build configuration
+---------|------------------------------|------------------------
+maguro | android-4.0.4_r1.1 or master | full_maguro-userdebug
+panda | master | full_panda-userdebug
+wingray | android-4.0.4_r1.1 or master | full_wingray-userdebug
+crespo | android-4.0.4_r1.1 or master | full_crespo-userdebug
+passion | android-2.3.7_r1 | full_passion-userdebug
+sapphire | android-2.2.3_r1 | full_sapphire-userdebug
+dream | android-2.2.3_r1 | full_dream-userdebug
## Flashing a device ##