commit ae76c10d73e8a434859d18aa04020e48379018a0
author Clay Murphy <claym@google.com> Wed Mar 12 22:27:48 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 12 22:27:48 2014 +0000
tree 6242e9425baf539db0746bd7bb5e56f9ceebcae1
parent ff1322addc340b1dd008b50b358eee60bfd1a96b
parent f7935f96ac73ae99c1ae3ce3c4c8ccd0b5096f5b

Merge "Docs: Fixing broken and malformed links."

src/devices/audio_implement.jd

diff --git a/src/devices/audio_implement.jd b/src/devices/audio_implement.jd
index 26aa5f5..2016367 100644
--- a/src/devices/audio_implement.jd
+++ b/src/devices/audio_implement.jd
@@ -136,7 +136,7 @@
 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 \

src/devices/camera/camera.jd

diff --git a/src/devices/camera/camera.jd b/src/devices/camera/camera.jd
index 577224b..4b4b22c 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_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

src/devices/graphics.jd

diff --git a/src/devices/graphics.jd b/src/devices/graphics.jd
index a906188..45ebfae 100644
--- a/src/devices/graphics.jd
+++ b/src/devices/graphics.jd
@@ -34,8 +34,8 @@
   <a href="http://developer.android.com/reference/android/graphics/Canvas.html">android.graphics.Canvas</a>
   is a 2D graphics API and is the most widely used graphics API by
   developers. Canvas operations draw all the stock <a href="http://developer.android.com/reference/android/view/View.html">android.view.View</a>s
-  and custom <a href="http://developer.android.com/reference/android/view/View.html">android.view.View</a>s in Android. Prior to Android 3.0, Canvas used the Skia 2D drawing library to
-  draw, which could not take advantage of hardware acceleration.
+  and custom <a href="http://developer.android.com/reference/android/view/View.html">android.view.View</a>s in Android. Prior to Android 3.0, Canvas always
+  used the non-hardware accelerated Skia 2D drawing library to draw.
 </p>
 <p>
   Introduced in Android 3.0, hardware acceleration for Canvas APIs uses a new drawing library
@@ -45,12 +45,8 @@
   supports OpenGL ES 2.0 is mandatory for Android 4.0 devices.
 </p>
 <p>
-  The OpenGLRenderer does not interact with Skia, so we
-  anticipate Skia to be slowly phased out without adverse effects to developers. Skia is currently
-  deprecated and in maintenance mode but will be neccessary for a while because most apps published
-  today still rely on non-hardware accelerated Canvas operations. In addition, not all Skia
-  operations are supported by OpenGL, so some operations are still done in software with Skia, even
-  with hardware acceleration turned on.
+  Additionally, the <a href="https://developer.android.com/guide/topics/graphics/hardware-accel.html">Hardware Acceleration guide</a>
+  explains how the hardware-accelerated drawing path works and identifies the differences in behavior from the software drawing path.
 </p>
 <p>
   The other main way that developers render graphics is by using OpenGL ES 1.x or 2.0 to directly