diff options
Diffstat (limited to 'security/tee_client_api')
| -rw-r--r-- | security/tee_client_api/Android.mk | 14 | ||||
| -rw-r--r-- | security/tee_client_api/s_version.h | 2 | ||||
| -rw-r--r-- | security/tee_client_api/tee_client_api_linux_driver.c | 8 |
3 files changed, 5 insertions, 19 deletions
diff --git a/security/tee_client_api/Android.mk b/security/tee_client_api/Android.mk index f8010f6..30279a6 100644 --- a/security/tee_client_api/Android.mk +++ b/security/tee_client_api/Android.mk @@ -1,8 +1,4 @@ -# Only applicable for OMAP4 and OMAP5 boards. -# First eliminate OMAP3 and then ensure that this is not used -# for customer boards -ifneq ($(TARGET_BOARD_PLATFORM),omap3) -ifeq ($(findstring omap, $(TARGET_BOARD_PLATFORM)),omap) +ifeq ($(TARGET_BOARD_PLATFORM),omap4) LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -12,14 +8,13 @@ LOCAL_ARM_MODE := arm LOCAL_SRC_FILES:= \ tee_client_api_linux_driver.c +LOCAL_CFLAGS += -DLINUX +LOCAL_CFLAGS += -D__ANDROID32__ + ifdef S_VERSION_BUILD LOCAL_CFLAGS += -DS_VERSION_BUILD=$(S_VERSION_BUILD) endif -LOCAL_LDLIBS += -llog - -LOCAL_CFLAGS += -DLINUX -LOCAL_CFLAGS += -DANDROID LOCAL_CFLAGS += -I $(LOCAL_PATH)/../tf_sdk/include/ LOCAL_MODULE:= libtee_client_api_driver @@ -27,4 +22,3 @@ LOCAL_MODULE_TAGS := optional include $(BUILD_STATIC_LIBRARY) endif -endif diff --git a/security/tee_client_api/s_version.h b/security/tee_client_api/s_version.h index cff19d7..64a376c 100644 --- a/security/tee_client_api/s_version.h +++ b/security/tee_client_api/s_version.h @@ -44,7 +44,7 @@ #if defined(WIN32) #define S_VERSION_OS "W" /* "W" for Windows PC (XP, Vista…) */ #define S_VERSION_PLATFORM "X" /* "X" for ix86 PC simulators */ -#elif defined(ANDROID) +#elif defined(__ANDROID32__) #define S_VERSION_OS "A" /* "A" for Android */ #define S_VERSION_PLATFORM "G" /* "G" for 4430 */ #elif defined(LINUX) diff --git a/security/tee_client_api/tee_client_api_linux_driver.c b/security/tee_client_api/tee_client_api_linux_driver.c index af5d36f..70ffcf3 100644 --- a/security/tee_client_api/tee_client_api_linux_driver.c +++ b/security/tee_client_api/tee_client_api_linux_driver.c @@ -96,13 +96,6 @@ typedef struct #define TRACE_WARNING(...) #define TRACE_INFO(...) #else -#if defined ANDROID -#define LOG_TAG "TEE" -#include <android/log.h> -#define TRACE_INFO(format, ...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, format, __VA_ARGS__) -#define TRACE_ERROR(format, ...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, format, __VA_ARGS__) -#define TRACE_WARNING(format, ...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, format, __VA_ARGS__) -#else static void TRACE_ERROR(const char* format, ...) { va_list ap; @@ -132,7 +125,6 @@ static void TRACE_INFO(const char* format, ...) fprintf(stderr, "\n"); va_end(ap); } -#endif /* ANDROID */ #endif /* NDEBUG */ |