From 4745a3d96edcf43536ee0d39e1bef17c19a44262 Mon Sep 17 00:00:00 2001 From: Michael Butler Date: Thu, 11 Jul 2019 15:43:22 -0700 Subject: [PATCH] NNAPI VTS fix from NNAPI CL: Cleanup HalInterfaces.h Prior to this CL, HalInterfaces.h polluted the global namespace through the "using" declarations. To fix b/72880287, those names were put in a new ::android::nn::hal namespace. This CL fixes the compilation errors that occur due to this cleanup. Bug: 72880287 Test: mma Change-Id: Idb228e37615af7c0343a09f9a51de378e63bdb5a --- neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp | 3 +++ neuralnetworks/1.2/vts/functional/GeneratedTestHarness.cpp | 4 ++++ neuralnetworks/1.2/vts/functional/GeneratedTestsV1_0.cpp | 2 ++ neuralnetworks/1.2/vts/functional/GeneratedTestsV1_1.cpp | 2 ++ neuralnetworks/1.2/vts/functional/GeneratedTestsV1_2.cpp | 2 ++ neuralnetworks/1.2/vts/functional/ValidateRequest.cpp | 1 + 6 files changed, 14 insertions(+) diff --git a/neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp b/neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp index adbf224fee..b66dd64a52 100644 --- a/neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp +++ b/neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp @@ -41,8 +41,11 @@ namespace V1_2 { namespace vts { namespace functional { +using ::android::hardware::neuralnetworks::V1_0::OperandLifeTime; +using ::android::hardware::neuralnetworks::V1_1::ExecutionPreference; using ::android::hardware::neuralnetworks::V1_2::implementation::ExecutionCallback; using ::android::hardware::neuralnetworks::V1_2::implementation::PreparedModelCallback; +using ::android::hidl::memory::V1_0::IMemory; using ::android::nn::allocateSharedMemory; using ::test_helper::MixedTypedExample; diff --git a/neuralnetworks/1.2/vts/functional/GeneratedTestHarness.cpp b/neuralnetworks/1.2/vts/functional/GeneratedTestHarness.cpp index c3578cdca7..495f3ecdb6 100644 --- a/neuralnetworks/1.2/vts/functional/GeneratedTestHarness.cpp +++ b/neuralnetworks/1.2/vts/functional/GeneratedTestHarness.cpp @@ -49,9 +49,13 @@ using ::android::hardware::neuralnetworks::V1_0::ErrorStatus; using ::android::hardware::neuralnetworks::V1_0::Request; using ::android::hardware::neuralnetworks::V1_0::RequestArgument; using ::android::hardware::neuralnetworks::V1_1::ExecutionPreference; +using ::android::hardware::neuralnetworks::V1_2::Constant; using ::android::hardware::neuralnetworks::V1_2::IDevice; using ::android::hardware::neuralnetworks::V1_2::IPreparedModel; +using ::android::hardware::neuralnetworks::V1_2::MeasureTiming; using ::android::hardware::neuralnetworks::V1_2::Model; +using ::android::hardware::neuralnetworks::V1_2::OutputShape; +using ::android::hardware::neuralnetworks::V1_2::Timing; using ::android::hardware::neuralnetworks::V1_2::implementation::ExecutionCallback; using ::android::hardware::neuralnetworks::V1_2::implementation::PreparedModelCallback; using ::android::hidl::memory::V1_0::IMemory; diff --git a/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_0.cpp b/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_0.cpp index b4e6696403..6fbd1dc6a2 100644 --- a/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_0.cpp +++ b/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_0.cpp @@ -34,8 +34,10 @@ namespace V1_2 { namespace vts { namespace functional { +using ::android::hardware::neuralnetworks::V1_0::OperandLifeTime; using ::android::hardware::neuralnetworks::V1_2::implementation::ExecutionCallback; using ::android::hardware::neuralnetworks::V1_2::implementation::PreparedModelCallback; +using ::android::hidl::memory::V1_0::IMemory; using ::android::nn::allocateSharedMemory; using ::test_helper::MixedTypedExample; diff --git a/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_1.cpp b/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_1.cpp index 33212fb002..d824e4348c 100644 --- a/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_1.cpp +++ b/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_1.cpp @@ -34,8 +34,10 @@ namespace V1_2 { namespace vts { namespace functional { +using ::android::hardware::neuralnetworks::V1_0::OperandLifeTime; using ::android::hardware::neuralnetworks::V1_2::implementation::ExecutionCallback; using ::android::hardware::neuralnetworks::V1_2::implementation::PreparedModelCallback; +using ::android::hidl::memory::V1_0::IMemory; using ::android::nn::allocateSharedMemory; using ::test_helper::MixedTypedExample; diff --git a/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_2.cpp b/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_2.cpp index 8481b4d7eb..1928b8c03c 100644 --- a/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_2.cpp +++ b/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_2.cpp @@ -34,8 +34,10 @@ namespace V1_2 { namespace vts { namespace functional { +using ::android::hardware::neuralnetworks::V1_0::OperandLifeTime; using ::android::hardware::neuralnetworks::V1_2::implementation::ExecutionCallback; using ::android::hardware::neuralnetworks::V1_2::implementation::PreparedModelCallback; +using ::android::hidl::memory::V1_0::IMemory; using ::android::nn::allocateSharedMemory; using ::test_helper::MixedTypedExample; diff --git a/neuralnetworks/1.2/vts/functional/ValidateRequest.cpp b/neuralnetworks/1.2/vts/functional/ValidateRequest.cpp index a7e83289f1..cf5905f688 100644 --- a/neuralnetworks/1.2/vts/functional/ValidateRequest.cpp +++ b/neuralnetworks/1.2/vts/functional/ValidateRequest.cpp @@ -35,6 +35,7 @@ namespace V1_2 { namespace vts { namespace functional { +using ::android::hardware::neuralnetworks::V1_0::RequestArgument; using ::android::hardware::neuralnetworks::V1_2::implementation::ExecutionCallback; using ::android::hidl::memory::V1_0::IMemory; using test_helper::for_all;