Stop using stlport.
authorDan Albert <danalbert@google.com>
Mon, 17 Nov 2014 22:21:24 +0000 (14:21 -0800)
committerDan Albert <danalbert@google.com>
Mon, 17 Nov 2014 22:21:24 +0000 (14:21 -0800)
Bug: 15193147
Change-Id: Ib432eb3d54ccc04bcd21562c87384bd8ea292828

mobicore/Android.mk
mobicore/daemon/Android.mk

index 008228e4e629bbf6923884f6ba8bed9088d25972..707520044ce629a78d41794957498f95e8bebbfb 100644 (file)
@@ -16,8 +16,6 @@ GLOBAL_INCLUDES := \
        $(COMP_PATH_MobiCoreDriverMod)/Public \
        $(COMP_PATH_MobiCore)/inc/TlCm
 
-GLOBAL_CXX_STL := stlport
-
 # Include the Daemon
 include $(MOBICORE_PROJECT_PATH)/daemon/Android.mk
 
index b567c477e1d1d593a706475555475ce58eca74a6..4798947c21bca1943b195d387474aeb75f867f57 100644 (file)
@@ -13,7 +13,6 @@ 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\"
@@ -48,7 +47,6 @@ 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