summaryrefslogtreecommitdiff
path: root/mobicore/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'mobicore/Android.mk')
-rw-r--r--mobicore/Android.mk23
1 files changed, 7 insertions, 16 deletions
diff --git a/mobicore/Android.mk b/mobicore/Android.mk
index 7ac9806..85fb67c 100644
--- a/mobicore/Android.mk
+++ b/mobicore/Android.mk
@@ -5,6 +5,7 @@
# =============================================================================
MOBICORE_PROJECT_PATH := $(call my-dir)
# Setup common variables
+LOG_WRAPPER := $(MOBICORE_PROJECT_PATH)/common/LogWrapper
COMP_PATH_MobiCore := $(MOBICORE_PROJECT_PATH)/common/MobiCore
COMP_PATH_MobiCoreDriverMod := $(MOBICORE_PROJECT_PATH)/include
@@ -14,34 +15,24 @@ GLOBAL_INCLUDES := bionic \
external/stlport/stlport \
$(COMP_PATH_MobiCore)/inc \
$(COMP_PATH_MobiCoreDriverMod)/Public \
- $(COMP_PATH_MobiCore)/inc/TlCm \
- $(COMP_PATH_MobiCore)/inc/GP \
- $(MOBICORE_PROJECT_PATH)/common/DrSecureStorage
+ $(COMP_PATH_MobiCore)/inc/TlCm
GLOBAL_LIBRARIES := libstlport
# Include the Daemon
-include $(MOBICORE_PROJECT_PATH)/daemon/Android.mk
+include $(MOBICORE_PROJECT_PATH)/MobiCoreDriverLib/Android.mk
-MC_INCLUDE_DIR := \
- $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
- $(COMP_PATH_MobiCore)/inc \
- $(COMP_PATH_MobiCore)/inc/GP \
+MC_INCLUDE_DIR := $(COMP_PATH_MobiCore)/inc \
$(COMP_PATH_MobiCore)/inc/TlCm \
$(COMP_PATH_MobiCore)/inc/TlCm/2.0 \
- $(MOBICORE_PROJECT_PATH)/daemon/ClientLib/public \
- $(MOBICORE_PROJECT_PATH)/daemon/Registry/Public
-
+ $(MOBICORE_PROJECT_PATH)/MobiCoreDriverLib/ClientLib/public \
+ $(MOBICORE_PROJECT_PATH)/MobiCoreDriverLib/Registry/Public
MC_DEBUG := _DEBUG
SYSTEM_LIB_DIR=/system/lib
GDM_PROVLIB_SHARED_LIBS=libMcClient
-# Include the provisioning lib
-include $(MOBICORE_PROJECT_PATH)/provlib/Android.mk
-
-LOCAL_ADDITIONAL_DEPENDENCIES += \
- $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
MOBICORE_DIR_INC := $(MC_INCLUDE_DIR)
+include $(MOBICORE_PROJECT_PATH)/rootpa/Code/Common/Android.mk
include $(MOBICORE_PROJECT_PATH)/rootpa/Code/Android/app/jni/Android.mk
include $(MOBICORE_PROJECT_PATH)/rootpa/Code/Android/lib/Android.mk
include $(MOBICORE_PROJECT_PATH)/rootpa/Code/Android/app/Android.mk