Don't manually link stlport.

Change-Id: Ie2c698447ba478b3f79f2cc8331427190973ebf0

diff --git a/mobicore/Android.mk b/mobicore/Android.mk
index c89cb228edb9291d16d2eba604a565286df077e8..008228e4e629bbf6923884f6ba8bed9088d25972 100644 (file)
--- a/mobicore/Android.mk
+++ b/mobicore/Android.mk
@@ -11,13 +11,12 @@ COMP_PATH_MobiCoreDriverMod := $(MOBICORE_PROJECT_PATH)/include
 
 
 # Application wide Cflags
-GLOBAL_INCLUDES := bionic \
-       external/stlport/stlport \
+GLOBAL_INCLUDES := \
        $(COMP_PATH_MobiCore)/inc \
        $(COMP_PATH_MobiCoreDriverMod)/Public \
        $(COMP_PATH_MobiCore)/inc/TlCm
 
-GLOBAL_LIBRARIES := libstlport
+GLOBAL_CXX_STL := stlport
 
 # Include the Daemon
 include $(MOBICORE_PROJECT_PATH)/daemon/Android.mk

diff --git a/mobicore/daemon/Android.mk b/mobicore/daemon/Android.mk
index 4798947c21bca1943b195d387474aeb75f867f57..b567c477e1d1d593a706475555475ce58eca74a6 100644 (file)
--- a/mobicore/daemon/Android.mk
+++ b/mobicore/daemon/Android.mk
@@ -13,6 +13,7 @@ LOCAL_MODULE := libMcClient
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES += $(GLOBAL_INCLUDES)
 LOCAL_SHARED_LIBRARIES += $(GLOBAL_LIBRARIES)
+LOCAL_CXX_STL := $(GLOBAL_CXX_STL)
 
 LOCAL_CFLAGS := -fvisibility=hidden -fvisibility-inlines-hidden
 LOCAL_CFLAGS += -DLOG_TAG=\"McClient\"
@@ -47,6 +48,7 @@ LOCAL_CFLAGS += -include buildTag.h
 LOCAL_CFLAGS += -DLOG_TAG=\"McDaemon\"
 LOCAL_C_INCLUDES += $(GLOBAL_INCLUDES)
 LOCAL_SHARED_LIBRARIES += $(GLOBAL_LIBRARIES)
+LOCAL_CXX_STL := $(GLOBAL_CXX_STL)
 
 include $(LOCAL_PATH)/Daemon/Android.mk