diff options
| author | Krzysztof Jackiewicz <k.jackiewicz@samsung.com> | 2019-10-09 16:22:54 +0200 |
|---|---|---|
| committer | Krzysztof Jackiewicz <k.jackiewicz@samsung.com> | 2019-10-09 16:32:02 +0200 |
| commit | 6fead949a94b2932e0855efae5e5bbeaf716be85 (patch) | |
| tree | b402fcf64a8cd86e2f78f23a2e0638dff9ccbef5 | |
| parent | dcb415b2a48e507086c516e54da637d31c6b30e4 (diff) | |
| download | key-manager-ta-tizen_5.5.tar.gz key-manager-ta-tizen_5.5.tar.bz2 key-manager-ta-tizen_5.5.zip | |
Move the logging code to a common directorytizen_5.5.m2_releasesubmit/tizen_5.5_mobile_hotfix/20201026.185104submit/tizen_5.5/20191031.000004submit/tizen/20191011.053630accepted/tizen/unified/20191015.011903accepted/tizen/5.5/unified/mobile/hotfix/20201027.085855accepted/tizen/5.5/unified/20191031.021820tizen_5.5_mobile_hotfixtizen_5.5accepted/tizen_5.5_unified_mobile_hotfixaccepted/tizen_5.5_unified
This is to avoid 2-way calls between ta and serialization directories which SAM
complains about.
Change-Id: Ibac9f6e6bbda7ee37c7bc5591cfa2a480c9c0531
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | common/include/log.h (renamed from ta/include/log.h) | 0 | ||||
| -rw-r--r-- | common/src/log.c (renamed from ta/src/log.c) | 0 | ||||
| -rw-r--r-- | serialization/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ta/CMakeLists.txt | 4 |
5 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index eafbd21..46b3b66 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,7 @@ PROJECT("key-manager-ta") SET(KEY_MANAGER_TA_ROOT_PATH ${PROJECT_SOURCE_DIR}) SET(KEY_MANAGER_TA_PATH ${KEY_MANAGER_TA_ROOT_PATH}/ta) SET(KEY_MANAGER_TA_SERIALIZATION_PATH ${KEY_MANAGER_TA_ROOT_PATH}/serialization) +SET(KEY_MANAGER_TA_COMMON_PATH ${KEY_MANAGER_TA_ROOT_PATH}/common) IF (CMAKE_BUILD_TYPE MATCHES "DEBUG") ADD_DEFINITIONS("-DBUILD_TYPE_DEBUG") @@ -34,6 +35,7 @@ ENDIF (CMAKE_BUILD_TYPE MATCHES "DEBUG") INCLUDE_DIRECTORIES( ${KEY_MANAGER_TA_PATH}/include ${KEY_MANAGER_TA_SERIALIZATION_PATH}/include + ${KEY_MANAGER_TA_COMMON_PATH}/include ) ADD_DEFINITIONS("-D${CMAKE_BUILD_TYPE}") diff --git a/ta/include/log.h b/common/include/log.h index 0c519b7..0c519b7 100644 --- a/ta/include/log.h +++ b/common/include/log.h diff --git a/ta/src/log.c b/common/src/log.c index 25ba45d..25ba45d 100644 --- a/ta/src/log.c +++ b/common/src/log.c diff --git a/serialization/CMakeLists.txt b/serialization/CMakeLists.txt index 915f412..99640cf 100644 --- a/serialization/CMakeLists.txt +++ b/serialization/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Samsung Electronics Co., Ltd All Rights Reserved +# Copyright (c) 2017 - 2019 Samsung Electronics Co., Ltd All Rights Reserved # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ SET(TARGET_KEY_MANAGER_TA_SERIALIZATION km_serialization) SET(KEY_MANAGER_TA_SERIALIZATION_SOURCES ${KEY_MANAGER_TA_SERIALIZATION_PATH}/src/km_serialization.c - ${KEY_MANAGER_TA_PATH}/src/log.c + ${KEY_MANAGER_TA_COMMON_PATH}/src/log.c ) SET(KEY_MANAGER_TA_SERIALIZATION_HEADERS diff --git a/ta/CMakeLists.txt b/ta/CMakeLists.txt index 850215b..b473bc3 100644 --- a/ta/CMakeLists.txt +++ b/ta/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Samsung Electronics Co., Ltd All Rights Reserved +# Copyright (c) 2017 - 2019 Samsung Electronics Co., Ltd All Rights Reserved # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,9 +32,9 @@ SET(KEY_MANAGER_TA_SOURCES ${KEY_MANAGER_TA_PATH}/src/crypto_padding.c ${KEY_MANAGER_TA_PATH}/src/crypto_symmetric.c ${KEY_MANAGER_TA_PATH}/src/internal.c - ${KEY_MANAGER_TA_PATH}/src/log.c ${KEY_MANAGER_TA_PATH}/src/km_ta.c ${KEY_MANAGER_TA_PATH}/src/base64.c + ${KEY_MANAGER_TA_COMMON_PATH}/src/log.c ${KEY_MANAGER_TA_SERIALIZATION_PATH}/src/km_serialization.c ) |