From 6319bdd5809fc3fa0c3bc0397ae69252e837bf98 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 26 Sep 2014 10:58:03 -0700 Subject: [PATCH] Don't manually link stlport. Change-Id: Ie2c698447ba478b3f79f2cc8331427190973ebf0 --- mobicore/Android.mk | 5 ++--- mobicore/daemon/Android.mk | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mobicore/Android.mk b/mobicore/Android.mk index c89cb22..008228e 100644 --- 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 4798947..b567c47 100644 --- 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 -- 2.20.1