commit 2c9309f51fb860b8b62b45d7d06fb8d2647a638c
author Clay Murphy <claym@google.com> Fri Mar 07 02:28:04 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 07 02:28:04 2014 +0000
tree f5568d9c5615d388e417883be0c1be94293f02ea
parent 82358bd43ed5c827f1157992aa955babf1b4d43a
parent 66afdb1ffe6bb474569aeb59a4d23551da7e1312

am 66afdb1f: am 8046d816: am 43b42a40: Merge "Docs: Making updates to version information. Bug:11133857 Staging location: http://claym.mtv.corp.google.com:8092/compatibility/cts-intro.html"

* commit '66afdb1ffe6bb474569aeb59a4d23551da7e1312':

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