Remove temporary include of ErrorStatus in ExecutionBuilder (#560)

This commit removes temporary include of ErrorStatus in ExecutionBuilder and enables that include in HallInterfaces.h

Signed-off-by: sjsujinkim <sjsujin.kim@samsung.com>

diff --git a/src/runtime/ref/nn/common/include/HalInterfaces.h b/src/runtime/ref/nn/common/include/HalInterfaces.h
index 8977c3b..3812d62 100644 (file)
--- a/src/runtime/ref/nn/common/include/HalInterfaces.h
+++ b/src/runtime/ref/nn/common/include/HalInterfaces.h
@@ -34,6 +34,7 @@
 using ::android::hardware::hidl_memory;
 using ::android::hardware::hidl_vec;
 using ::android::hardware::neuralnetworks::V1_0::DataLocation;
+using ::android::hardware::neuralnetworks::V1_0::ErrorStatus;
 using ::android::hardware::neuralnetworks::V1_0::FusedActivationFunc;
 using ::android::hardware::neuralnetworks::V1_0::Model;
 using ::android::hardware::neuralnetworks::V1_0::Operand;
@@ -53,7 +54,6 @@ using ::android::hardware::hidl_vec;
 using ::android::hardware::neuralnetworks::V1_0::Capabilities;
 using ::android::hardware::neuralnetworks::V1_0::DataLocation;
 using ::android::hardware::neuralnetworks::V1_0::DeviceStatus;
-using ::android::hardware::neuralnetworks::V1_0::ErrorStatus;
 using ::android::hardware::neuralnetworks::V1_0::FusedActivationFunc;
 using ::android::hardware::neuralnetworks::V1_0::IDevice;
 using ::android::hardware::neuralnetworks::V1_0::IExecutionCallback;

diff --git a/src/runtime/ref/nn/runtime/ExecutionBuilder.cpp b/src/runtime/ref/nn/runtime/ExecutionBuilder.cpp
index 72f2ebc..aca788e 100644 (file)
--- a/src/runtime/ref/nn/runtime/ExecutionBuilder.cpp
+++ b/src/runtime/ref/nn/runtime/ExecutionBuilder.cpp
@@ -32,9 +32,6 @@
 #include <vector>
 #endif
 
-// NNRT: Added to fix build error about ErrorStatus
-using ::android::hardware::neuralnetworks::V1_0::ErrorStatus;
-
 namespace android {
 namespace nn {