Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3835f619 authored by Michael Butler's avatar Michael Butler Committed by Slava Shklyaev
Browse files

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
Merged-In: Idb228e37615af7c0343a09f9a51de378e63bdb5a
(cherry picked from commit 4745a3d9)
parent ee7fe25e

neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp

+3 −0
Original line number Diff line number Diff line
@@ -42,8 +42,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;

neuralnetworks/1.2/vts/functional/GeneratedTestHarness.cpp

+4 −0
Original line number Diff line number Diff line
@@ -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;

neuralnetworks/1.2/vts/functional/GeneratedTestsV1_0.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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;

neuralnetworks/1.2/vts/functional/GeneratedTestsV1_1.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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;

neuralnetworks/1.2/vts/functional/GeneratedTestsV1_2.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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;