aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Reed <reed@google.com>2009-12-09 15:47:38 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-09 15:47:38 -0800
commiteedfd9d50490886cb681c0b73ef34649f3d94360 (patch)
tree90fb28b91ed0ce0356d07948ca17b6d1ef654fc1
parentf8190342e7fad57a9540316bb1bc3125a3ebd6aa (diff)
parent021529fe63d931815fe7aad09578caf130c28670 (diff)
downloadsystem_core-eedfd9d50490886cb681c0b73ef34649f3d94360.tar.gz
system_core-eedfd9d50490886cb681c0b73ef34649f3d94360.tar.bz2
system_core-eedfd9d50490886cb681c0b73ef34649f3d94360.zip
am 021529fe: link explicitly against libskia
Merge commit '021529fe63d931815fe7aad09578caf130c28670' into eclair-mr2-plus-aosp * commit '021529fe63d931815fe7aad09578caf130c28670': link explicitly against libskia
-rw-r--r--libjnigraphics/Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/libjnigraphics/Android.mk b/libjnigraphics/Android.mk
index 2af67c3b..9458f282 100644
--- a/libjnigraphics/Android.mk
+++ b/libjnigraphics/Android.mk
@@ -21,7 +21,8 @@ LOCAL_SRC_FILES:= \
bitmap.cpp
LOCAL_SHARED_LIBRARIES := \
- libandroid_runtime
+ libandroid_runtime \
+ libskia
LOCAL_C_INCLUDES += \
external/skia/include/core \