merge in old CLs to new jd files
Change-Id: Iee99364f6a99270fee5f4fdb766ec39fb51a74d1
diff --git a/src/source/initializing.jd b/src/source/initializing.jd
index 029f308..f53e6fb 100644
--- a/src/source/initializing.jd
+++ b/src/source/initializing.jd
@@ -24,11 +24,50 @@
</div>
</div>
-<p>Before you begin, ensure that your system meets the <a href="{@docRoot}source/building.html">minimum requirements</a>.
-
-<h2 id="setup-linux">Setting up a Linux Build Environment</h2>
-
-<h3 id="installing-the-jdk">Installing the JDK</h3>
+<h1 id="initializing-a-build-environment">Initializing a Build Environment</h1>
+<p>The "Getting Started" section describes how to set up your local work environment, how to use Repo to get the Android files, and how to build the files on your machine. To build the Android source files, you will need to use Linux or Mac OS. Building under Windows is not currently supported.</p>
+<p><em>Note: The source download is approximately 8.5GB in size.
+You will need over 30GB free to complete a single build, and
+up to 100GB (or more) for a full set of builds.</em></p>
+<p>For an overview of the entire code-review and code-update process, see <a href="life-of-a-patch.html">Life of a Patch</a>.</p>
+<h1 id="choosing-a-branch">Choosing a Branch</h1>
+<p>Some of the requirements for your build environment are determined by which
+version of the source code you plan to compile. See
+<a href="build-numbers.html">Build Numbers</a> for a full listing of branches you may
+choose from. You may also choose to download and build the latest source code
+(called "master"), in which case you will simply omit the branch specification
+when you initialize the repository.</p>
+<p>Once you have selected a branch, follow the appropriate instructions below to
+set up your build environment.</p>
+<h1 id="setting-up-a-linux-build-environment">Setting up a Linux build environment</h1>
+<p>These instructions apply to all branches, including master.</p>
+<p>The Android build is routinely tested in house on recent versions of
+Ubuntu LTS (10.04), but most distributions should have the required
+build tools available. Reports of successes or failures on other
+distributions are welcome.</p>
+<p>For Gingerbread (2.3.x) and newer versions, including the master
+branch, a 64-bit environment is required. Older versions can be
+compiled on 32-bit systems.</p>
+<p><em>Note: It is also possible to build Android in a virtual machine.
+If you are running Linux in a virtual machine, you will need at
+least 16GB of RAM/swap and 30GB or more of disk space in order to
+build the Android tree.</em></p>
+<p>Detailed instructions for Ubuntu and MacOS follow. In general you will need:</p>
+<ul>
+<li>
+<p>Python 2.6 -- 2.7, which you can download from <a href="http://www.python.org/download/">python.org</a>.</p>
+</li>
+<li>
+<p>GNU Make 3.81 -- 3.82, which you can download from <a href="http://ftp.gnu.org/gnu/make/">gnu.org</a>,</p>
+</li>
+<li>
+<p>JDK 6 if you wish to build Gingerbread or newer; JDK 5 for Froyo or older. You can download both from <a href="http://java.sun.com/javase/downloads/">java.sun.com</a>.</p>
+</li>
+<li>
+<p>Git 1.7 or newer. You can find it at <a href="http://git-scm.com/download">git-scm.com</a>.</p>
+</li>
+</ul>
+<h2 id="installing-the-jdk">Installing the JDK</h2>
<p>The Sun JDK is no longer in Ubuntu's main package repository. In order to download it, you need to add the appropriate repository and indicate to the system which JDK should be used.</p>
<p>Java 6: for Gingerbread and newer</p>
<pre><code>$ sudo add-apt-repository "deb http://archive.canonical.com/ lucid partner"
@@ -43,7 +82,7 @@
</code></pre>
<p><em>Note: The <code>lunch</code> command in the build step will ensure that the Sun JDK is
used instead of any previously installed JDK.</em></p>
-<h3 id="installing-required-packages-ubuntu-1004-1110">Installing required packages (Ubuntu 10.04 -- 11.10)</h3>
+<h2 id="installing-required-packages-ubuntu-1004-1110">Installing required packages (Ubuntu 10.04 -- 11.10)</h2>
<p>You will need a 64-bit version of Ubuntu. Ubuntu 10.04 is recommended.
Building using a newer version of Ubuntu is currently only experimentally
supported and is not guaranteed to work on branches other than master.</p>
@@ -59,17 +98,17 @@
<p>On Ubuntu 11.10:</p>
<pre><code>$ sudo apt-get install libx11-dev:i386
</code></pre>
-<h3 id="installing-required-packages-ubuntu-1204">Installing required packages (Ubuntu 12.04)</h3>
+<h2 id="installing-required-packages-ubuntu-1204">Installing required packages (Ubuntu 12.04)</h2>
<p>Building on Ubuntu 12.04 is currently only experimentally supported and is not
guaranteed to work on branches other than master.</p>
<pre><code>$ sudo apt-get install git gnupg flex bison gperf build-essential \
zip curl libc6-dev libncurses5-dev:i386 x11proto-core-dev \
libx11-dev:i386 libreadline6-dev:i386 libgl1-mesa-glx:i386 \
- libgl1-mesa-dev g++-multilib mingw32 openjdk-6-jdk tofrodos \
+ libgl1-mesa-dev g++-multilib mingw32 tofrodos \
python-markdown libxml2-utils xsltproc zlib1g-dev:i386
$ sudo ln -s /usr/lib/i386-linux-gnu/mesa/libGL.so.1 /usr/lib/i386-linux-gnu/libGL.so
</code></pre>
-<h3 id="configuring-usb-access">Configuring USB Access</h3>
+<h2 id="configuring-usb-access">Configuring USB Access</h2>
<p>Under GNU/linux systems (and specifically under Ubuntu systems),
regular users can't directly access USB devices by default. The
system needs to be configured to allow such access.</p>
@@ -106,9 +145,9 @@
SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e42", MODE="0600", OWNER="<username>"
# fastboot protocol on grouper/tilapia (Nexus 7)
SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e40", MODE="0600", OWNER="<username>"
-# adb protocol on mako/manta (Nexus 4, Nexus 10)
+# adb protocol on manta (Nexus 10)
SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4ee2", MODE="0600", OWNER="<username>"
-# fastboot protocol on mako/manta (Nexus 4, Nexus 10)
+# fastboot protocol on manta (Nexus 10)
SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4ee0", MODE="0600", OWNER="<username>"
</code></pre>
<p>Those new rules take effect the next time a device is plugged in.
@@ -118,7 +157,7 @@
Lucid Lynx (10.04.x LTS). Other versions of Ubuntu or other
variants of GNU/linux might require different configurations.</p>
<p><a name="ccache"></a></p>
-<h3 id="setting-up-ccache">Setting up ccache</h3>
+<h2 id="setting-up-ccache">Setting up ccache</h2>
<p>You can optionally tell the build to use the ccache compilation tool.
Ccache acts as a compiler cache that can be used to speed-up rebuilds.
This works very well if you do "make clean" often, or if you frequently
@@ -141,7 +180,7 @@
<pre><code>prebuilt/linux-x86/ccache/ccache -M 50G
</code></pre>
<p>This setting is stored in the CCACHE_DIR and is persistent.</p>
-<h3 id="using-a-separate-output-directory">Using a separate output directory</h3>
+<h2 id="using-a-separate-output-directory">Using a separate output directory</h2>
<p>By default, the output of each build is stored in the out/
subdirectory of the matching source tree.</p>
<p>On some machines with multiple storage devices, builds are
@@ -167,7 +206,7 @@
unpredictable results.</p>
<p>This is only supported on Jelly Bean (4.1) and newer,
including the master branch.</p>
-<h2 id="setting-up-a-mac-os-x-build-environment">Setting up a Mac OS X build environment</h2>
+<h1 id="setting-up-a-mac-os-x-build-environment">Setting up a Mac OS X build environment</h1>
<p>In a default installation, OS X runs on a case-preserving but case-insensitive
filesystem. This type of filesystem is not supported by git and will cause some
git commands (such as "git status") to behave abnormally. Because of this, we
@@ -191,14 +230,14 @@
function mountAndroid { hdiutil attach ~/android.dmg -mountpoint /Volumes/android; }
</code></pre>
<p>Once mounted, you'll do all your work in the "android" volume. You can eject it (unmount it) just like you would with an external drive.</p>
-<h3 id="master-branch">Master branch</h3>
+<h2 id="master-branch">Master branch</h2>
<p>To build the latest source in a Mac OS environment, you will need an Intel/x86
machine running MacOS 10.6 (Snow Leopard) or MacOS 10.7 (Lion), along with Xcode
4.2 (Apple's Developer Tools). Although Lion does not come with a JDK, it should
install automatically when you attempt to build the source.</p>
<p>The remaining sections for Mac OS X only apply to those who wish to build
earlier branches.</p>
-<h3 id="branch-40x-and-all-earlier-branches">Branch 4.0.x and all earlier branches</h3>
+<h2 id="branch-40x-and-all-earlier-branches">Branch 4.0.x and all earlier branches</h2>
<p>To build android-4.0.x and earlier branches in a Mac OS environment, you need an
Intel/x86 machine running MacOS 10.5 (Leopard) or MacOS 10.6 (Snow Leopard). You
will need the MacOS 10.5 SDK.</p>
@@ -255,8 +294,11 @@
</li>
</ul>
<h3 id="setting-a-file-descriptor-limit">Setting a file descriptor limit</h3>
-<p>On MacOS the default limit on the number of simultaneous file descriptors open is too low and a highly parallel build process may exceed this limit. </p>
+<p>On MacOS the default limit on the number of simultaneous file descriptors open is too low and a highly parallel build process may exceed this limit.<br />
+</p>
<p>To increase the cap, add the following lines to your <code>~/.bash_profile</code>: </p>
<pre><code># set the number of open files to be 1024
ulimit -S -n 1024
</code></pre>
+<h1 id="next-download-the-source">Next: Download the source</h1>
+<p>Your build environment is good to go! Proceed to <a href="downloading.html">downloading the source</a>....</p>
\ No newline at end of file