diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-17 22:27:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-17 22:27:44 +0000 |
| commit | cc2706542fc0fb3b54c40e173e9d08d042571660 (patch) | |
| tree | 3dd0e09516a75fb024595ff8ce76b33549500c66 | |
| parent | 5eb3e42ab19502d21b7235fe2693ac8ed1e8c35c (diff) | |
| parent | d83a6bd28a779de0ae05ed556b276d0e96308663 (diff) | |
| download | android_hardware_samsung_slsi_exynos5-cc2706542fc0fb3b54c40e173e9d08d042571660.tar.gz android_hardware_samsung_slsi_exynos5-cc2706542fc0fb3b54c40e173e9d08d042571660.tar.bz2 android_hardware_samsung_slsi_exynos5-cc2706542fc0fb3b54c40e173e9d08d042571660.zip | |
Merge "Stop using stlport."
| -rw-r--r-- | mobicore/Android.mk | 2 | ||||
| -rw-r--r-- | mobicore/daemon/Android.mk | 2 |
2 files changed, 0 insertions, 4 deletions
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 |