summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bf9009e)
raw | patch | inline | side by side (parent: bf9009e)
author | Victor Chong <victor.chong@linaro.org> | |
Thu, 7 Jun 2018 03:37:00 +0000 (04:37 +0100) | ||
committer | Jérôme Forissier <jerome.forissier@linaro.org> | |
Thu, 7 Jun 2018 16:31:14 +0000 (18:31 +0200) |
Signed-off-by: Victor Chong <victor.chong@linaro.org>
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
host/xtest/regression_1000.c | patch | blob | history | |
ta/os_test/Android.mk | patch | blob | history | |
ta/os_test_lib/Android.mk | [new file with mode: 0644] | patch | blob |
ta/os_test_lib/include/os_test_lib.h | patch | blob | history |
index 9d701a142e443817ac959235f59e83c16cc516f6..06773ef54693c724347f58df25e251945ad72eeb 100644 (file)
static void xtest_tee_test_1016(ADBG_Case_t *Case_p);
static void xtest_tee_test_1017(ADBG_Case_t *Case_p);
static void xtest_tee_test_1018(ADBG_Case_t *Case_p);
-#if defined(CFG_TA_DYNLINK) && !defined(__ANDROID__)
+#if defined(CFG_TA_DYNLINK)
static void xtest_tee_test_1019(ADBG_Case_t *Case_p);
#endif
"Test coalescing memrefs");
ADBG_CASE_DEFINE(regression, 1018, xtest_tee_test_1018,
"Test memref out of bounds");
-#if defined(CFG_TA_DYNLINK) && !defined(__ANDROID__)
+#if defined(CFG_TA_DYNLINK)
ADBG_CASE_DEFINE(regression, 1019, xtest_tee_test_1019,
"Test dynamically linked TA");
#endif
TEEC_ReleaseSharedMemory(&shm);
}
-#if defined(CFG_TA_DYNLINK) && !defined(__ANDROID__)
+#if defined(CFG_TA_DYNLINK)
static void xtest_tee_test_1019(ADBG_Case_t *c)
{
TEEC_Session session = { 0 };
diff --git a/ta/os_test/Android.mk b/ta/os_test/Android.mk
index 8136a3b8b6256765c95ebd9002b067c23e9019eb..b81f94ce205825e176f1a1bc56994df107dc4fea 100644 (file)
--- a/ta/os_test/Android.mk
+++ b/ta/os_test/Android.mk
LOCAL_PATH := $(call my-dir)
local_module := 5b9e0e40-2636-11e1-ad9e-0002a5d5c51b.ta
+ifeq ($(CFG_TA_DYNLINK),y)
+local_module_deps := ffd2bded-ab7d-4988-95ee-e4962fff7154.ta
+endif
include $(BUILD_OPTEE_MK)
diff --git a/ta/os_test_lib/Android.mk b/ta/os_test_lib/Android.mk
--- /dev/null
@@ -0,0 +1,4 @@
+LOCAL_PATH := $(call my-dir)
+
+local_module := ffd2bded-ab7d-4988-95ee-e4962fff7154.ta
+include $(BUILD_OPTEE_MK)
index 51cf69cfbb39480ef406af4ec733acfb822489d2..9be11e4fbae4e2d3bb4a4f5015752f56df5d696d 100644 (file)
#ifndef _OS_TEST_LIB_H_
#define _OS_TEST_LIB_H_
-#if defined(CFG_TA_DYNLINK) && !defined(__ANDROID__)
+#if defined(CFG_TA_DYNLINK)
int os_test_shlib_add(int a, int b);
void os_test_shlib_panic(void);
{
}
-#endif /* CFG_TA_DYNLINK && !__ANDROID__ */
+#endif /* CFG_TA_DYNLINK */
#endif /* _OS_TEST_LIB_H_ */