commit e05129fc0eb58baa033b4d309cc2db03e262ee9e
author Raph Levien <raph@google.com> Thu Apr 11 18:09:32 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 11 18:09:32 2013 +0000
tree 2978272f845a51de8e9187ed820f138c1a8c4650
parent eb323f3df1f2d2d2ac7c368f2e4584ca197c738d
parent 19ab554305561e06cfa5a633a28369dc02b6ea04

Merge "Add additional scripts in font mapping" into jb-mr2-dev

Android.mk

diff --git a/Android.mk b/Android.mk
index a6cfb4a..68fd312 100644
--- a/Android.mk
+++ b/Android.mk
@@ -451,6 +451,7 @@
 	emoji/EmojiFont.cpp
 
 LOCAL_SHARED_LIBRARIES := \
+	liblog \
 	libcutils \
 	libemoji \
 	libjpeg \

legacy/Android.mk

diff --git a/legacy/Android.mk b/legacy/Android.mk
index 9bb40f1..214bd89 100644
--- a/legacy/Android.mk
+++ b/legacy/Android.mk
@@ -271,6 +271,7 @@
 
 LOCAL_SHARED_LIBRARIES := \
 	libcutils \
+	liblog \
 	libemoji \
 	libjpeg \
 	libutils \
@@ -310,4 +311,4 @@
 
 LOCAL_MODULE:= libskia_legacy
 
-include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file
+include $(BUILD_SHARED_LIBRARY)