IVGCVSW-1806 More Android NN Driver refactoring
* Changed #if defined to #ifdef
* Simplified the Android ML namespace resolution
* Fixed the relative path in some include directives
Change-Id: I46e46faff98559c8042c1a4b8b82007f462df57d
diff --git a/test/Concurrent.cpp b/test/Concurrent.cpp
index 92f6f8f..55a1a39 100644
--- a/test/Concurrent.cpp
+++ b/test/Concurrent.cpp
@@ -24,7 +24,7 @@
ALOGI("ConcurrentExecute: entry");
auto driver = std::make_unique<ArmnnDriver>(DriverOptions(armnn::Compute::CpuRef));
- neuralnetworks::V1_0::Model model = {};
+ V1_0::Model model = {};
// add operands
int32_t actValue = 0;
@@ -39,7 +39,7 @@
// make the fully connected operation
model.operations.resize(1);
- model.operations[0].type = neuralnetworks::V1_0::OperationType::FULLY_CONNECTED;
+ model.operations[0].type = V1_0::OperationType::FULLY_CONNECTED;
model.operations[0].inputs = hidl_vec<uint32_t>{0, 1, 2, 3};
model.operations[0].outputs = hidl_vec<uint32_t>{4};