commit ff1be9e9bc2d2fc5e8dd94a716f6df20179d6dd9
author Jens Wiklander <jens.wiklander@linaro.org> Thu Feb 01 14:16:57 2018 +0100
committer Jérôme Forissier <jerome.forissier@linaro.org> Thu Feb 01 17:43:44 2018 +0100
tree 0214ad2ef1ae60b0b4ba07d10cefed49f70d3c5c
parent 04511d8bcf10e97345b023a14ea1629774110c06

Move ta_storage.h to common location

Since ta_storage.h is used by several TAs move it into a common
location.

Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

Android.mk

diff --git a/Android.mk b/Android.mk
index 46d1b06..5767ca1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -70,7 +70,7 @@
 		$(LOCAL_PATH)/ta/os_test/include \
 		$(LOCAL_PATH)/ta/rpc_test/include \
 		$(LOCAL_PATH)/ta/sims/include \
-		$(LOCAL_PATH)/ta/storage/include \
+		$(LOCAL_PATH)/ta/include \
 		$(LOCAL_PATH)/ta/storage_benchmark/include \
 		$(LOCAL_PATH)/ta/sha_perf/include \
 		$(LOCAL_PATH)/ta/aes_perf/include \

host/xtest/Makefile

diff --git a/host/xtest/Makefile b/host/xtest/Makefile
index 8305dd9..d094691 100644
--- a/host/xtest/Makefile
+++ b/host/xtest/Makefile
@@ -81,13 +81,13 @@
 CFLAGS += -I$(OPTEE_CLIENT_EXPORT)/include
 CFLAGS += -I$(TA_DEV_KIT_DIR)/host_include
 
+CFLAGS += -I../../ta/include
 CFLAGS += -I../../ta/create_fail_test/include
 CFLAGS += -I../../ta/crypt/include
 CFLAGS += -I../../ta/enc_fs/include
 CFLAGS += -I../../ta/os_test/include
 CFLAGS += -I../../ta/rpc_test/include
 CFLAGS += -I../../ta/sims/include
-CFLAGS += -I../../ta/storage/include
 CFLAGS += -I../../ta/storage_benchmark/include
 CFLAGS += -I../../ta/concurrent/include
 CFLAGS += -I../../ta/concurrent_large/include

ta/include/ta_storage.h

diff --git a/ta/storage/include/ta_storage.h b/ta/include/ta_storage.h
similarity index 96%
rename from ta/storage/include/ta_storage.h
rename to ta/include/ta_storage.h
index 45b3d25..c5e8d38 100644
--- a/ta/storage/include/ta_storage.h
+++ b/ta/include/ta_storage.h
@@ -25,8 +25,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TA_STORAGE_H
-#define TA_STORAGE_H
+#ifndef __TA_STORAGE_H
+#define __TA_STORAGE_H
 
 #define TA_STORAGE_UUID { 0xb689f2a7, 0x8adf, 0x477a, \
 	{ 0x9f, 0x99, 0x32, 0xe9, 0x0c, 0x0a, 0xd0, 0xa2 } }
@@ -56,4 +56,4 @@
 #define TA_STORAGE_CMD_RESET_OBJ		20
 #define TA_STORAGE_CMD_GET_OBJ_INFO		21
 
-#endif /*TA_SKELETON_H */
+#endif /*__TA_STORAGE_H*/

ta/storage/sub.mk

diff --git a/ta/storage/sub.mk b/ta/storage/sub.mk
index c5a00cb..2aef410 100644
--- a/ta/storage/sub.mk
+++ b/ta/storage/sub.mk
@@ -1,3 +1,4 @@
 global-incdirs-y += include
+global-incdirs-y += ../include
 srcs-y += storage.c
 srcs-y += ta_entry.c

ta/storage2/include/ta_storage.h

diff --git a/ta/storage2/include/ta_storage.h b/ta/storage2/include/ta_storage.h
deleted file mode 100644
index eec9871..0000000
--- a/ta/storage2/include/ta_storage.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../storage/include/ta_storage.h"

ta/storage2/sub.mk

diff --git a/ta/storage2/sub.mk b/ta/storage2/sub.mk
index c5a00cb..2aef410 100644
--- a/ta/storage2/sub.mk
+++ b/ta/storage2/sub.mk
@@ -1,3 +1,4 @@
 global-incdirs-y += include
+global-incdirs-y += ../include
 srcs-y += storage.c
 srcs-y += ta_entry.c