commit b80acad7d6daa5d4279131e47afeffddabe838f0
author Mike Reed <reed@google.com> Wed Dec 09 18:38:19 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Dec 09 18:38:19 2009 -0800
tree 4087dcf56d9f49421f18bff14db27c401577edb1
parent a4e26ca9409d1bbb21c103f7a6c42ad926f81dbd
parent eedfd9d50490886cb681c0b73ef34649f3d94360

am eedfd9d5: am 021529fe: link explicitly against libskia

Merge commit 'eedfd9d50490886cb681c0b73ef34649f3d94360'

* commit 'eedfd9d50490886cb681c0b73ef34649f3d94360':
  link explicitly against libskia

libjnigraphics/Android.mk

diff --git a/libjnigraphics/Android.mk b/libjnigraphics/Android.mk
index 2af67c3..9458f28 100644
--- a/libjnigraphics/Android.mk
+++ b/libjnigraphics/Android.mk
@@ -21,7 +21,8 @@
 	bitmap.cpp
 
 LOCAL_SHARED_LIBRARIES := \
-    libandroid_runtime
+    libandroid_runtime \
+    libskia
 
 LOCAL_C_INCLUDES += \
 	external/skia/include/core \