aboutsummaryrefslogtreecommitdiffstats
path: root/native/Android.mk
diff options
context:
space:
mode:
authorsatok <satok@google.com>2011-12-12 23:51:46 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-12-12 23:51:46 -0800
commitb2632553bfcae5beb92f7366a71f15de30f44a9c (patch)
tree6fc4bc0f2b2633fea68259f396ba414e8d1a4f89 /native/Android.mk
parent8e404536cd20a5624acf5cea0c3aae19324b0e3f (diff)
parent16379df633feaefb118257096956869edfd25a2c (diff)
downloadlatinime-b2632553bfcae5beb92f7366a71f15de30f44a9c.tar.gz
latinime-b2632553bfcae5beb92f7366a71f15de30f44a9c.tar.xz
latinime-b2632553bfcae5beb92f7366a71f15de30f44a9c.zip
Merge "Use priority queue for native string buffer"
Diffstat (limited to 'native/Android.mk')
-rw-r--r--native/Android.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/native/Android.mk b/native/Android.mk
index d2537f055..5dcc1e578 100644
--- a/native/Android.mk
+++ b/native/Android.mk
@@ -46,15 +46,19 @@ LOCAL_MODULE := libjni_latinime
LOCAL_MODULE_TAGS := user
+# For STL
+LOCAL_C_INCLUDES += external/stlport/stlport bionic
+LOCAL_SHARED_LIBRARIES += libstlport
+
ifeq ($(FLAG_DO_PROFILE), true)
$(warning Making profiling version of native library)
LOCAL_CFLAGS += -DFLAG_DO_PROFILE
- LOCAL_SHARED_LIBRARIES := libcutils libutils
+ LOCAL_SHARED_LIBRARIES += libcutils libutils
else # FLAG_DO_PROFILE
ifeq ($(FLAG_DBG), true)
$(warning Making debug version of native library)
LOCAL_CFLAGS += -DFLAG_DBG
- LOCAL_SHARED_LIBRARIES := libcutils libutils
+ LOCAL_SHARED_LIBRARIES += libcutils libutils
endif # FLAG_DBG
endif # FLAG_DO_PROFILE