summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher N. Hesse <raymanfx@gmail.com>2016-07-31 01:32:52 +0200
committerAndreas Schneider <asn@cryptomilk.org>2016-08-16 09:05:14 +0200
commit917f1a3b884188bfbe5a731e1be9a63e525598be (patch)
treeed62ed101ef25bc36f45438e395ca409236c7dfb
parent06f17ef12e49baf3f136f35e257488623d329221 (diff)
downloadandroid_hardware_samsung_slsi_exynos5430-917f1a3b884188bfbe5a731e1be9a63e525598be.tar.gz
android_hardware_samsung_slsi_exynos5430-917f1a3b884188bfbe5a731e1be9a63e525598be.tar.xz
android_hardware_samsung_slsi_exynos5430-917f1a3b884188bfbe5a731e1be9a63e525598be.zip
mobicore: Purge makefiles
Many of these include paths are non-existant and many makefile rules are actually broken. All of them will be errors in N, so fix it before it bites us. Change-Id: Iceb5a49879fb287f8f1cb9d80799d9e6cec34ce5
-rw-r--r--libsecurepath/Android.mk5
-rw-r--r--mobicore/Android.mk1
-rw-r--r--mobicore/common/LogWrapper/Android.mk15
-rw-r--r--mobicore/daemon/Android.mk37
-rw-r--r--mobicore/daemon/Application.mk3
-rw-r--r--mobicore/daemon/Common/Android.mk8
-rw-r--r--mobicore/daemon/Daemon/Device/Android.mk2
-rw-r--r--mobicore/daemon/Daemon/FSD/Android.mk3
-rw-r--r--mobicore/provlib/Application.mk2
9 files changed, 30 insertions, 46 deletions
diff --git a/libsecurepath/Android.mk b/libsecurepath/Android.mk
index 8c49c11..5de96ce 100644
--- a/libsecurepath/Android.mk
+++ b/libsecurepath/Android.mk
@@ -30,10 +30,11 @@ LOCAL_SRC_FILES += \
LOCAL_C_INCLUDES += \
$(TOP)/hardware/samsung_slsi-cm/$(TARGET_BOARD_PLATFORM)/include \
+ $(TOP)/hardware/samsung_slsi-cm/$(TARGET_BOARD_PLATFORM)/mobicore/common/LogWrapper \
$(TOP)/hardware/samsung_slsi-cm/exynos/include
-LOCAL_SHARED_LIBRARIES += libMcClient
+LOCAL_SHARED_LIBRARIES += libMcClient liblog
-include hardware/samsung_slsi-cm/$(TARGET_SOC)/mobicore/common/LogWrapper/Android.mk
+LOCAL_CFLAGS += -DLOG_ANDROID
include $(BUILD_STATIC_LIBRARY)
diff --git a/mobicore/Android.mk b/mobicore/Android.mk
index 4152d7f..7ac9806 100644
--- a/mobicore/Android.mk
+++ b/mobicore/Android.mk
@@ -5,7 +5,6 @@
# =============================================================================
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
diff --git a/mobicore/common/LogWrapper/Android.mk b/mobicore/common/LogWrapper/Android.mk
deleted file mode 100644
index b869c2b..0000000
--- a/mobicore/common/LogWrapper/Android.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# =============================================================================
-#
-# MobiCore log wrapper to be included by Android components / products
-#
-# =============================================================================
-
-# This is not a separate module.
-# Only for inclusion by other modules.
-
-LOCAL_SHARED_LIBRARIES += liblog
-
-# Enable logging to logcat per default
-LOCAL_CFLAGS += -DLOG_ANDROID
-
-LOCAL_C_INCLUDES += $(call my-dir) \ No newline at end of file
diff --git a/mobicore/daemon/Android.mk b/mobicore/daemon/Android.mk
index dfd3a4c..fe884ff 100644
--- a/mobicore/daemon/Android.mk
+++ b/mobicore/daemon/Android.mk
@@ -12,7 +12,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libMcClient
LOCAL_MODULE_TAGS := debug eng optional
LOCAL_C_INCLUDES += $(GLOBAL_INCLUDES)
-LOCAL_SHARED_LIBRARIES += $(GLOBAL_LIBRARIES)
+LOCAL_SHARED_LIBRARIES += $(GLOBAL_LIBRARIES) liblog
LOCAL_CFLAGS := -fvisibility=hidden -fvisibility-inlines-hidden
LOCAL_CFLAGS += -include buildTag.h
@@ -26,23 +26,22 @@ LOCAL_SRC_FILES += \
ClientLib/Session.cpp \
Common/CMutex.cpp \
Common/Connection.cpp \
- ClientLib/GP/tee_client_api.cpp
+ ClientLib/GP/tee_client_api.cpp
LOCAL_C_INCLUDES +=\
- $(LOCAL_PATH)/Common \
- $(LOCAL_PATH)/ClientLib/public \
- $(LOCAL_PATH)/ClientLib/public/GP \
- $(COMP_PATH_TlSdk)/Public/GPD_TEE_Internal_API \
- $(COMP_PATH_MobiCore)/inc/McLib
+ $(LOCAL_PATH)/Common \
+ $(LOCAL_PATH)/ClientLib/public \
+ $(LOCAL_PATH)/ClientLib/public/GP \
+ $(LOCAL_PATH)/../common/LogWrapper \
+ $(COMP_PATH_MobiCore)/inc/McLib
LOCAL_EXPORT_C_INCLUDE_DIRS +=\
$(COMP_PATH_MobiCore)/inc \
$(LOCAL_PATH)/ClientLib/public
+LOCAL_CFLAGS += -DLOG_ANDROID
include $(LOCAL_PATH)/Kernel/Android.mk
-# Import logwrapper
-include $(LOG_WRAPPER)/Android.mk
include $(BUILD_SHARED_LIBRARY)
@@ -56,7 +55,7 @@ LOCAL_CFLAGS += -include buildTag.h
LOCAL_CFLAGS += -DLOG_TAG=\"McDaemon\"
LOCAL_CFLAGS += -DTBASE_API_LEVEL=3
LOCAL_C_INCLUDES += $(GLOBAL_INCLUDES)
-LOCAL_SHARED_LIBRARIES += $(GLOBAL_LIBRARIES) libMcClient
+LOCAL_SHARED_LIBRARIES += $(GLOBAL_LIBRARIES) libMcClient liblog
include $(LOCAL_PATH)/Daemon/Android.mk
@@ -69,9 +68,9 @@ LOCAL_SRC_FILES += Common/CMutex.cpp \
# Includes required for the Daemon
LOCAL_C_INCLUDES +=\
- $(LOCAL_PATH)/ClientLib/public \
- $(LOCAL_PATH)/Common \
- $(COMP_PATH_TlSdk)/Public/GPD_TEE_Internal_API \
+ $(LOCAL_PATH)/ClientLib/public \
+ $(LOCAL_PATH)/Common \
+ $(LOCAL_PATH)/../common/LogWrapper
# Private Registry components
@@ -81,8 +80,8 @@ LOCAL_SRC_FILES += Registry/PrivateRegistry.cpp
# Common components
include $(LOCAL_PATH)/Kernel/Android.mk
-# Logwrapper
-include $(LOG_WRAPPER)/Android.mk
+
+LOCAL_CFLAGS += -DLOG_ANDROID
include $(BUILD_EXECUTABLE)
@@ -94,11 +93,12 @@ LOCAL_MODULE := libMcRegistry
LOCAL_MODULE_TAGS := debug eng optional
LOCAL_CFLAGS += -DLOG_TAG=\"McRegistry\"
LOCAL_C_INCLUDES += $(GLOBAL_INCLUDES)
-LOCAL_SHARED_LIBRARIES += $(GLOBAL_LIBRARIES)
+LOCAL_SHARED_LIBRARIES += $(GLOBAL_LIBRARIES) liblog
LOCAL_C_INCLUDES += $(LOCAL_PATH)/Common \
$(LOCAL_PATH)/Daemon/public \
- $(LOCAL_PATH)/ClientLib/public
+ $(LOCAL_PATH)/ClientLib/public \
+ $(LOCAL_PATH)/../common/LogWrapper
# Common Source files required for building the daemon
LOCAL_SRC_FILES += Common/CMutex.cpp \
@@ -110,7 +110,6 @@ LOCAL_SRC_FILES += Common/CMutex.cpp \
include $(LOCAL_PATH)/Registry/Android.mk
-# Import logwrapper
-include $(LOG_WRAPPER)/Android.mk
+LOCAL_CFLAGS += -DLOG_ANDROID
include $(BUILD_SHARED_LIBRARY)
diff --git a/mobicore/daemon/Application.mk b/mobicore/daemon/Application.mk
index d36202d..dda3298 100644
--- a/mobicore/daemon/Application.mk
+++ b/mobicore/daemon/Application.mk
@@ -16,7 +16,6 @@ APP_OPTIM := debug
# Application wide Cflags
GLOBAL_INCLUDES := \
$(COMP_PATH_MobiCoreDriverMod)/Public \
- $(COMP_PATH_TlSdk)/Public/MobiCore/inc \
$(COMP_PATH_MobiCore)/inc \
$(COMP_PATH_TlCm)/Public \
$(COMP_PATH_TlCm)/Public/TlCm
@@ -24,6 +23,4 @@ GLOBAL_INCLUDES := \
# Show all warnings
APP_CFLAGS += -Wall
-LOG_WRAPPER := $(COMP_PATH_Logwrapper)
-
APP_PLATFORM := android-9
diff --git a/mobicore/daemon/Common/Android.mk b/mobicore/daemon/Common/Android.mk
index 39f050e..55747b7 100644
--- a/mobicore/daemon/Common/Android.mk
+++ b/mobicore/daemon/Common/Android.mk
@@ -21,7 +21,11 @@ LOCAL_MODULE := Common
# Header files required by components including this module
LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)
-# Import logwrapper
-#include $(COMP_PATH_Logwrapper)/Android.mk
+# Enable logging
+# LOCAL_SHARED_LIBRARIES += liblog
+#
+# LOCAL_CFLAGS += -DLOG_ANDROID
+#
+# LOCAL_C_INCLUDES += $(LOCAL_PATH)/../common/LogWrapper
include $(BUILD_STATIC_LIBRARY)
diff --git a/mobicore/daemon/Daemon/Device/Android.mk b/mobicore/daemon/Daemon/Device/Android.mk
index e830526..6a22222 100644
--- a/mobicore/daemon/Daemon/Device/Android.mk
+++ b/mobicore/daemon/Daemon/Device/Android.mk
@@ -22,4 +22,4 @@ LOCAL_SRC_FILES += $(DEVICE_PATH)/DeviceIrqHandler.cpp \
$(DEVICE_PATH)/TAExitHandler.cpp \
$(DEVICE_PATH)/MobiCoreDevice.cpp \
$(DEVICE_PATH)/NotificationQueue.cpp \
- $(DEVICE_PATH)/TrustletSession.cpp \
+ $(DEVICE_PATH)/TrustletSession.cpp
diff --git a/mobicore/daemon/Daemon/FSD/Android.mk b/mobicore/daemon/Daemon/FSD/Android.mk
index 77f7cd3..8c8f578 100644
--- a/mobicore/daemon/Daemon/FSD/Android.mk
+++ b/mobicore/daemon/Daemon/FSD/Android.mk
@@ -11,8 +11,7 @@ FSD_PATH := Daemon/FSD
# Add new folders with header files here
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(FSD_PATH)/public \
- $(COMP_PATH_DrSecureStorage)/Public \
$(MOBICORE_PROJECT_PATH)/include/GPD_TEE_Internal_API
# Add new source files here
-LOCAL_SRC_FILES += $(FSD_PATH)/FSD.cpp \ \ No newline at end of file
+LOCAL_SRC_FILES += $(FSD_PATH)/FSD.cpp \ No newline at end of file
diff --git a/mobicore/provlib/Application.mk b/mobicore/provlib/Application.mk
index 36d0913..fde1054 100644
--- a/mobicore/provlib/Application.mk
+++ b/mobicore/provlib/Application.mk
@@ -13,7 +13,7 @@ APP_OPTIM := debug
# Show all warnings
#APP_CFLAGS := -Wall
-MC_INCLUDE_DIR := $(COMP_PATH_TlSdk)/Public/MobiCore/inc \
+MC_INCLUDE_DIR := \
$(COMP_PATH_TlCm)/Public \
$(COMP_PATH_TlCm)/Public/TlCm \
$(COMP_PATH_TlCm)/Public/TlCm/2.0 \