aboutsummaryrefslogtreecommitdiff
path: root/src/devices
diff options
context:
space:
mode:
authorClay Murphy <claym@google.com>2014-03-11 20:45:20 +0000
committerQiwen Zhao <zhao@google.com>2014-06-04 09:13:17 -0700
commitfa897819bfc1fbb77aba4ec10b5d7380a9d2997a (patch)
tree9adb1ecc4f51e637f6ebba45158a4e324eddad83 /src/devices
parentf67d9e453a85e82e9abca0758aa6ec86ca93a02c (diff)
downloadsource.android.com-fa897819bfc1fbb77aba4ec10b5d7380a9d2997a.tar.gz
DO NOT MERGE: Revert "docs/source.android.com: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
This reverts commit 4ec43f0c2ce5792ee004d614aff6926162188c98. Change-Id: I4f40d6704f0874e1e87b62324b33c9ec58d79e7e
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/audio_implement.jd2
-rw-r--r--src/devices/camera/camera.jd2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/audio_implement.jd b/src/devices/audio_implement.jd
index 26aa5f58..2016367f 100644
--- a/src/devices/audio_implement.jd
+++ b/src/devices/audio_implement.jd
@@ -136,7 +136,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := audio.primary.tuna
-LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
LOCAL_SRC_FILES := audio_hw.c ril_interface.c
LOCAL_C_INCLUDES += \
external/tinyalsa/include \
diff --git a/src/devices/camera/camera.jd b/src/devices/camera/camera.jd
index 577224b8..4b4b22cd 100644
--- a/src/devices/camera/camera.jd
+++ b/src/devices/camera/camera.jd
@@ -112,7 +112,7 @@ These parameters are set with the function pointed to by
<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_RELATIVE_PATH := hw
+LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/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