From 9b4bf48429669a003ac5e70b3b3230a4a64fc58e Mon Sep 17 00:00:00 2001
From: sjsujinkim <sjsujin.kim@samsung.com>
Date: Fri, 23 Mar 2018 16:22:53 +0900
Subject: [PATCH] Add Log.h into Utils.h

This commit adds Log.h into Utils.h

Signed-off-by: sjsujinkim <sjsujin.kim@samsung.com>
---
 src/runtime/ref/nn/common/CMakeLists.txt          | 2 +-
 src/runtime/ref/nn/common/include/Utils.h         | 1 +
 src/runtime/ref/nn/runtime/CompilationBuilder.cpp | 1 -
 src/runtime/ref/nn/runtime/ModelBuilder.cpp       | 1 -
 src/runtime/ref/nn/runtime/ModelBuilder.h         | 2 +-
 src/runtime/ref/nn/runtime/NeuralNetworks.cpp     | 1 -
 6 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/runtime/ref/nn/common/CMakeLists.txt b/src/runtime/ref/nn/common/CMakeLists.txt
index 2f6c6ce..c2f4383 100644
--- a/src/runtime/ref/nn/common/CMakeLists.txt
+++ b/src/runtime/ref/nn/common/CMakeLists.txt
@@ -4,4 +4,4 @@ SET (DEPEND_SRCS ${SRCS})
 SET (DEPEND_INCS ${INC_DIRS})
 
 add_library(runtime_ref_common SHARED ${RUNTIME_SRCS} ${DEPEND_SRCS})
-include_directories(runtime_ref_common PRIVATE . include ../runtime/include ${DEPEND_INCS})
+include_directories(runtime_ref_common PRIVATE . include ../include ../runtime/include ${DEPEND_INCS})
diff --git a/src/runtime/ref/nn/common/include/Utils.h b/src/runtime/ref/nn/common/include/Utils.h
index 488f0a2..71fcde1 100644
--- a/src/runtime/ref/nn/common/include/Utils.h
+++ b/src/runtime/ref/nn/common/include/Utils.h
@@ -21,6 +21,7 @@
 #include "HalInterfaces.h"
 #endif
 #include "NeuralNetworks.h"
+#include "Log.h"
 
 #if 0 // REF-ANN
 #include <android-base/logging.h>
diff --git a/src/runtime/ref/nn/runtime/CompilationBuilder.cpp b/src/runtime/ref/nn/runtime/CompilationBuilder.cpp
index 41dda03..e83f866 100644
--- a/src/runtime/ref/nn/runtime/CompilationBuilder.cpp
+++ b/src/runtime/ref/nn/runtime/CompilationBuilder.cpp
@@ -18,7 +18,6 @@
 
 #include "CompilationBuilder.h"
 #include "Utils.h"
-#include "Log.h"
 
 // TODO Include these files once availible
 #if 0
diff --git a/src/runtime/ref/nn/runtime/ModelBuilder.cpp b/src/runtime/ref/nn/runtime/ModelBuilder.cpp
index 395f7f8..d435a83 100644
--- a/src/runtime/ref/nn/runtime/ModelBuilder.cpp
+++ b/src/runtime/ref/nn/runtime/ModelBuilder.cpp
@@ -18,7 +18,6 @@
 #include "ModelBuilder.h"
 
 #include "CompilationBuilder.h"
-#include "Utils.h"
 
 #include "Log.h"
 
diff --git a/src/runtime/ref/nn/runtime/ModelBuilder.h b/src/runtime/ref/nn/runtime/ModelBuilder.h
index a3f782b..847b8d4 100644
--- a/src/runtime/ref/nn/runtime/ModelBuilder.h
+++ b/src/runtime/ref/nn/runtime/ModelBuilder.h
@@ -26,10 +26,10 @@
 #include <memory>
 
 #include "HalInterfaces.h"
+#include "Utils.h"
 #if 0
 #include "Memory.h"
 #include "NeuralNetworks.h"
-#include "Utils.h"
 #endif
 namespace android {
 namespace nn {
diff --git a/src/runtime/ref/nn/runtime/NeuralNetworks.cpp b/src/runtime/ref/nn/runtime/NeuralNetworks.cpp
index 825d88a..d720018 100644
--- a/src/runtime/ref/nn/runtime/NeuralNetworks.cpp
+++ b/src/runtime/ref/nn/runtime/NeuralNetworks.cpp
@@ -22,7 +22,6 @@
 
 #include "CompilationBuilder.h"
 #include "ModelBuilder.h"
-#include "Log.h"
 
 #include <iostream>
 
-- 
2.7.4