summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 88acd6b)
raw | patch | inline | side by side (parent: 88acd6b)
author | Zoltan Kuscsik <zoltan.kuscsik@linaro.org> | |
Thu, 31 Mar 2016 11:44:38 +0000 (13:44 +0200) | ||
committer | Zoltan Kuscsik <zoltan.kuscsik@linaro.org> | |
Fri, 8 Apr 2016 09:56:36 +0000 (11:56 +0200) |
AOSP build system defines the __ANDROID__
constant. No need for another one.
Change-Id: I2ff302e902386d1894441f4a4fa3bc5304320e05
Signed-off-by: Zoltan Kuscsik <zoltan.kuscsik@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Tested-by: Zoltan Kuscsik <zoltan.kuscsik@linaro.org>
constant. No need for another one.
Change-Id: I2ff302e902386d1894441f4a4fa3bc5304320e05
Signed-off-by: Zoltan Kuscsik <zoltan.kuscsik@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Tested-by: Zoltan Kuscsik <zoltan.kuscsik@linaro.org>
Android.mk | patch | blob | history | |
libteec/src/teec_trace.c | patch | blob | history |
diff --git a/Android.mk b/Android.mk
index 10256ee627320b763a54a5de3ed3e67a71125261..310609313479b08ff301fafb2a8bca9e6c1647e1 100644 (file)
--- a/Android.mk
+++ b/Android.mk
# Build libteec.so - TEE (Trusted Execution Environment) shared library #
################################################################################
include $(CLEAR_VARS)
-LOCAL_CFLAGS += -DANDROID_BUILD
LOCAL_CFLAGS += $(CFLAGS)
ifeq ($(CFG_TEE_CLIENT_LOG_FILE), true)
# Build tee supplicant #
################################################################################
include $(CLEAR_VARS)
-LOCAL_CFLAGS += -DANDROID_BUILD
LOCAL_CFLAGS += $(CFLAGS)
LOCAL_CFLAGS += -DDEBUGLEVEL_$(CFG_TEE_SUPP_LOG_LEVEL)
index 79beead55276350674af2b41ed0d6f24075f0067..78b79d65365a2b54ad757c3b120c6e17b113d35f 100644 (file)
--- a/libteec/src/teec_trace.c
+++ b/libteec/src/teec_trace.c
func = function;
#endif
-#ifdef ANDROID_BUILD
- /* TOD(emi): What is the syscall eq for Android ? */
- int thread_id = pthread_self();
-#else
/*
* pthread_self returns the POSIX tid which is different from
* the kernel id
*/
int thread_id = syscall(SYS_gettid); /* perf issue ? */
-#endif
snprintf(prefixed, MAX_PRINT_SIZE,
"%s [%d] %s:%s:%d: %s",