- Moved the build variants descriptions into build_system
- Added Makefile stub into sensors.jd as a starting point
- Small cleanup to build_new_device to reference the PRODUCT_* parameters
- Fixed URL in the README for app engine testing
Conflicts:
pdk/README
pdk/docs/guide/build_new_device.jd
pdk/docs/guide/build_system.jd
pdk/docs/guide/sensors.jd
diff --git a/pdk/README b/pdk/README
index 229db43..2bdba93 100644
--- a/pdk/README
+++ b/pdk/README
@@ -57,8 +57,8 @@
Here's the command to run the pdk-docs server locally:
python <path_to_appengine_installation>/dev_appserver.py --address 0.0.0.0 \
<path_to_cupcake_code>/android/out/target/common/docs
-
-To verify it is working you can access it with a browser locally on port 8080:
+
+To verify it is working, you can access it with a browser locally on port 8080:
http://localhost:8080/online-pdk/guide/index.html
diff --git a/pdk/docs/guide/build_new_device.jd b/pdk/docs/guide/build_new_device.jd
index 895ed3d..dabdfb0 100755
--- a/pdk/docs/guide/build_new_device.jd
+++ b/pdk/docs/guide/build_new_device.jd
@@ -1,4 +1,4 @@
-page.title=Building Android for a new Device
+page.title=Configuring a New Product
pdk.version=1.0
@jd:body
@@ -34,10 +34,12 @@
# Overrides
PRODUCT_NAME := <first_product_name>
PRODUCT_DEVICE := <board_name></pre>
- Additional product-specific variables can be added to this <a href="#androidBuildSystemProductDefFiles">Product Definition</a> file.
- </li>
+ <li>
+ Additional product-specific variables can be added to this <a href="#androidBuildSystemProductDefFiles">Product Definition</a>
+file.
+ </li>
<li>In the <code>products</code> directory, create an <code>AndroidProducts.mk</code> file that point to (and is responsible for finding) the individual product make files.<BR>
- <pre class="prettypring">
+ <pre class="prettyprint">
#
# This file should set PRODUCT_MAKEFILES to a list of product makefiles
# to expose to the build system. LOCAL_DIR will already be set to
@@ -98,8 +100,7 @@
#
# include more board specific stuff here? Such as Audio parameters.
#</pre>
-
- Additional Android.mk parameters
+
</li>
<li>To create a second product for the same board, create a second product-specific make file called <code>vendor/company_name/products/<second_product_name>.mk</code> that includes:<BR>
<pre class="prettyprint">
diff --git a/pdk/docs/guide/build_system.jd b/pdk/docs/guide/build_system.jd
index 4b29202..d229983 100755
--- a/pdk/docs/guide/build_system.jd
+++ b/pdk/docs/guide/build_system.jd
@@ -213,8 +213,8 @@
<code>eng<code>
</td>
<td>
- This is the default flavor. A plain "<code>make</code>" is the
- same as "<code>make eng</code>".
+ This is the default flavor. A plain <code>make</code> is the
+ same as <code>make eng</code>.
<ul>
<li>Installs modules tagged with: <code>eng</code>, <code>debug</code>,
<code>user</code>, and/or <code>development</code>.
@@ -232,7 +232,7 @@
<code>user<code>
</td>
<td>
- "<code>make user</code>"
+ <code>make user</code>
<p>
This is the flavor intended to be the final release bits.
<ul>
@@ -250,7 +250,7 @@
<code>userdebug<code>
</td>
<td>
- "<code>make userdebug</code>"
+ <code>make userdebug</code>
<p>
The same as <code>user</code>, except:
<ul>
@@ -263,7 +263,7 @@
<p>
If you build one flavor and then want to build another, you should run
-"<code>make installclean</code>" between the two makes to guarantee that
-you don't pick up files installed by the previous flavor. "<code>make
-clean</code>" will also suffice, but it takes a lot longer.
+<code>make installclean</code> between the two makes to guarantee that
+you don't pick up files installed by the previous flavor. <code>make
+clean</code> will also suffice, but it takes a lot longer.
</p>
\ No newline at end of file
diff --git a/pdk/docs/guide/pdk_toc.cs b/pdk/docs/guide/pdk_toc.cs
index f98f194..82f9e86 100644
--- a/pdk/docs/guide/pdk_toc.cs
+++ b/pdk/docs/guide/pdk_toc.cs
@@ -8,11 +8,14 @@
<li> <h2>Setup and Building</h2>
<ul>
- <li><a href="<?cs var:toroot ?>guide/system_requirements.html">Device Requirements</a></li>
- <li><a href="<?cs var:toroot ?>guide/build_system.html">Build System</a></li>
- <li><a href="<?cs var:toroot ?>guide/build_new_device.html">Building New Device</a></li>
- <li><a href="<?cs var:toroot ?>guide/build_cookbook.html">Build Cookbook</a></li>
- <li><a href="<?cs var:toroot ?>guide/bring_up.html">Bring up</a></li>
+ <li class="toggle-list">
+ <div><a href="<?cs var:toroot ?>guide/build_system.html">Build System</a></div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>guide/build_new_device.html">Configuring a New Product</a></li>
+ <li><a href="<?cs var:toroot ?>guide/build_cookbook.html">Build Cookbook</a></li>
+ <li><a href="<?cs var:toroot ?>guide/bring_up.html">Bring up</a></li>
+ </ul>
+ </li>
<li><a href="<?cs var:toroot ?>guide/release_keys.html">Release Keys and Signing Builds</a></li>
</ul>
</li>
diff --git a/pdk/docs/guide/sensors.jd b/pdk/docs/guide/sensors.jd
index 02f0c4e..d41dcd7 100755
--- a/pdk/docs/guide/sensors.jd
+++ b/pdk/docs/guide/sensors.jd
@@ -34,7 +34,8 @@
<code>libsensors.so</code> so that it will get loaded from <code>/system/lib</code> at runtime.
</p>
-<p> The following stub <code>Android.mk</code> file ensures that <code>libsensors</code> compiles and links to the appropriate libraries:</p>
+<p> The following stub file, <code>Android.mk</code>, ensures that <code>libsensors</code> compiles and links to the appropriate libraries:</p>
+
<pre>
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)