commit b09cbb8f6cd3fc857a05c7d30f78e9a7e3310cbd
author Clay Murphy <claym@google.com> Wed Feb 12 19:23:11 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 12 19:23:11 2014 +0000
tree 2eb4c424cdfc3c5a8d2118786791279a9f193cb4
parent 18aa55efd38a66f327664031a588f6d063c67d35
parent 1c89d73824d7406fa40ae64c92278a59f207734a

am 1c89d738: am a32e7eb0: am ec79d7d3: Merge "Docs: Beginning to split Audio content Bug: https://b.corp.google.com/issue?id=9391856 Staging location: http://claym.mtv.corp.google.com:8088/devices/audio.html"

* commit '1c89d73824d7406fa40ae64c92278a59f207734a':

src/devices/audio_implement.jd

diff --git a/src/devices/audio_implement.jd b/src/devices/audio_implement.jd
index a4e6b7f..9267d9e 100644
--- a/src/devices/audio_implement.jd
+++ b/src/devices/audio_implement.jd
@@ -137,7 +137,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := audio.primary.tuna
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_SRC_FILES := audio_hw.c ril_interface.c
 LOCAL_C_INCLUDES += \
         external/tinyalsa/include \

src/devices/camera/camera.jd

diff --git a/src/devices/camera/camera.jd b/src/devices/camera/camera.jd
index 4b4b22c..577224b 100644
--- a/src/devices/camera/camera.jd
+++ b/src/devices/camera/camera.jd
@@ -112,7 +112,7 @@
   <li>Create an <code>Android.mk</code> file to build the shared library. Ensure that the Makefile contains the following lines:
 <pre>
 LOCAL_MODULE := camera.&lt;device_name&gt;
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_RELATIVE_PATH := hw
 </pre>
 <p>Notice that your library must be named <code>camera.&lt;device_name&gt;</code> (<code>.so</code> is appended automatically),
 so that Android can correctly load the library. For an example, see the Makefile

src/devices/tech/security/se-linux.jd

diff --git a/src/devices/tech/security/se-linux.jd b/src/devices/tech/security/se-linux.jd
index 251cafc..e73cc2f 100644
--- a/src/devices/tech/security/se-linux.jd
+++ b/src/devices/tech/security/se-linux.jd
@@ -133,10 +133,10 @@
 </p>
 
 <pre>
-BOARD_SEPOLICY_DIRS := \
+BOARD_SEPOLICY_DIRS += \
         &lt;root&gt;/device/manufacturer/device-name/sepolicy
 
-BOARD_SEPOLICY_UNION := \
+BOARD_SEPOLICY_UNION += \
         genfs_contexts \ 
         file_contexts \ 
         sepolicy.te 

src/source/downloading.jd

diff --git a/src/source/downloading.jd b/src/source/downloading.jd
index f014694..bad88e2 100644
--- a/src/source/downloading.jd
+++ b/src/source/downloading.jd
@@ -69,6 +69,9 @@
 <p>
   For version 1.20, the SHA-1 checksum for repo is e197cb48ff4ddda4d11f23940d316e323b29671c
 </p>
+<p>
+  For version 1.21, the SHA-1 checksum for repo is b8bd1804f432ecf1bab730949c82b93b0fc5fede
+</p>
 <h2 id="initializing-a-repo-client">
   Initializing a Repo client
 </h2>