Support M

[GitHub/LineageOS/android_hardware_samsung_slsi_exynos5.git] / mobicore / Android.mk

diff --git a/mobicore/Android.mk b/mobicore/Android.mk
index f30202c88359cbede8e59c7af566e243dcf0e0d6..d9ec6748cbe072877934066af2d3042fc773bead 100644 (file)
--- a/mobicore/Android.mk
+++ b/mobicore/Android.mk
@@ -5,11 +5,20 @@
 # =============================================================================
 MOBICORE_PROJECT_PATH := $(call my-dir)
 # Setup common variables
-COMP_PATH_Logwrapper := $(MOBICORE_PROJECT_PATH)/common/LogWrapper
+LOG_WRAPPER := $(MOBICORE_PROJECT_PATH)/common/LogWrapper
 COMP_PATH_MobiCore := $(MOBICORE_PROJECT_PATH)/common/MobiCore
 COMP_PATH_MobiCoreDriverMod := $(MOBICORE_PROJECT_PATH)/include
 
 
+# Application wide Cflags
+GLOBAL_INCLUDES := bionic \
+       external/libcxx \
+       $(COMP_PATH_MobiCore)/inc \
+       $(COMP_PATH_MobiCoreDriverMod)/Public \
+       $(COMP_PATH_MobiCore)/inc/TlCm
+
+GLOBAL_LIBRARIES := libc++
+
 # Include the Daemon
 include $(MOBICORE_PROJECT_PATH)/daemon/Android.mk
 
@@ -17,9 +26,6 @@ MC_INCLUDE_DIR := $(COMP_PATH_MobiCore)/inc \
     $(COMP_PATH_MobiCore)/inc/TlCm \
     $(MOBICORE_PROJECT_PATH)/daemon/ClientLib/public \
     $(MOBICORE_PROJECT_PATH)/daemon/Registry/Public
-
 MC_DEBUG := _DEBUG
-
-# Include the provisioning lib
-include $(MOBICORE_PROJECT_PATH)/provlib/Android.mk
-
+SYSTEM_LIB_DIR=/system/lib
+GDM_PROVLIB_SHARED_LIBS=libMcClient