From: Dan Albert <danalbert@google.com>
Date: Mon, 17 Nov 2014 22:21:24 +0000 (-0800)
Subject: Stop using stlport.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d83a6bd28a779de0ae05ed556b276d0e96308663;p=GitHub%2FLineageOS%2Fandroid_hardware_samsung_slsi_exynos5.git

Stop using stlport.

Bug: 15193147
Change-Id: Ib432eb3d54ccc04bcd21562c87384bd8ea292828
---

diff --git a/mobicore/Android.mk b/mobicore/Android.mk
index 008228e..7075200 100644
--- a/mobicore/Android.mk
+++ b/mobicore/Android.mk
@@ -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
 
diff --git a/mobicore/daemon/Android.mk b/mobicore/daemon/Android.mk
index b567c47..4798947 100644
--- a/mobicore/daemon/Android.mk
+++ b/mobicore/daemon/Android.mk
@@ -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