auto import from //branches/cupcake/...@137197
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 6e5c4e0..18f2878 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -27,6 +27,7 @@
android_database_SQLiteProgram.cpp \
android_database_SQLiteQuery.cpp \
android_database_SQLiteStatement.cpp \
+ android_emoji_EmojiFactory.cpp \
android_view_Display.cpp \
android_view_Surface.cpp \
android_view_ViewRoot.cpp \
@@ -132,6 +133,7 @@
external/tremor/Tremor \
external/icu4c/i18n \
external/icu4c/common \
+ frameworks/opt/emoji
LOCAL_SHARED_LIBRARIES := \
libexpat \
@@ -156,12 +158,13 @@
libicui18n \
libicudata \
libmedia \
- libwpa_client
+ libwpa_client \
+ libemoji
ifeq ($(BOARD_HAVE_BLUETOOTH),true)
LOCAL_C_INCLUDES += \
external/dbus \
- external/bluez/libs/include
+ system/bluetooth/bluez-clean-headers
LOCAL_CFLAGS += -DHAVE_BLUETOOTH
LOCAL_SHARED_LIBRARIES += libbluedroid libdbus
endif
@@ -190,5 +193,4 @@
include $(BUILD_SHARED_LIBRARY)
-
include $(call all-makefiles-under,$(LOCAL_PATH))