mobicore: cleanup Makefiles, use reduced libstl
Remove PLATFORM from Android.mk files
Use reduced libstl from connectivity instead of default one.
Signed-off-by: Lukas Hänel <lukas.haenel@gi-de.com>
diff --git a/Android.mk b/Android.mk
index c89cb22..b2f9b86 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,12 +12,12 @@
# Application wide Cflags
GLOBAL_INCLUDES := bionic \
- external/stlport/stlport \
+ external/connectivity/stlport/stlport \
$(COMP_PATH_MobiCore)/inc \
$(COMP_PATH_MobiCoreDriverMod)/Public \
$(COMP_PATH_MobiCore)/inc/TlCm
-GLOBAL_LIBRARIES := libstlport
+#GLOBAL_LIBRARIES := libstlport
# Include the Daemon
include $(MOBICORE_PROJECT_PATH)/daemon/Android.mk
diff --git a/daemon/Android.mk b/daemon/Android.mk
index bf4fbf3..f25fb32 100644
--- a/daemon/Android.mk
+++ b/daemon/Android.mk
@@ -103,8 +103,3 @@
LOCAL_SHARED_LIBRARIES += libMcClient
include $(BUILD_SHARED_LIBRARY)
-
-# =============================================================================
-ifneq ($(filter-out Generic,$(PLATFORM)),)
- $(call import-module,$(COMP_PATH_QualcommQSEEComAPI))
-endif
diff --git a/daemon/Daemon/Device/Platforms/Android.mk b/daemon/Daemon/Device/Platforms/Android.mk
index 48dd98a..69a4702 100644
--- a/daemon/Daemon/Device/Platforms/Android.mk
+++ b/daemon/Daemon/Device/Platforms/Android.mk
@@ -8,8 +8,3 @@
# Always include the Generic code
include $(PLATFORMS_PATH)/Generic/Android.mk
-
-ifneq ($(filter-out Generic,$(PLATFORM)),)
- $(info PLATFORM: $(PLATFORM))
- include $(PLATFORMS_PATH)/$(PLATFORM)/Android.mk
-endif
diff --git a/daemon/Kernel/Android.mk b/daemon/Kernel/Android.mk
index a01b410..bd7d48a 100644
--- a/daemon/Kernel/Android.mk
+++ b/daemon/Kernel/Android.mk
@@ -8,11 +8,6 @@
include $(LOCAL_PATH)/Kernel/Platforms/Generic/Android.mk
-# Include platform specific sub-makefiles
-ifdef $(PLATFORM)
- include $(LOCAL_PATH)/Kernel/Platforms/$(PLATFORM)/Android.mk
-endif
-
# Add new source files here
LOCAL_SRC_FILES += Kernel/CKMod.cpp