Use system includes for libSampleDriver headers
Command used to generate this change:
for file in $(ls -1 driver/sample/*.h); do
header="${file#"driver/sample/"}"
perl -pi -e "s@^#include \"$header\"@#include <$header>@g" runtime/**/*.{h,cpp}
done
clang-format -i runtime/**/*.{h,cpp}
git commit -p
Bug: N/A
Test: m
Change-Id: I0e76903cc64a5d9b17bfc73eac7b860cdaf6aa44
Merged-In: I0e76903cc64a5d9b17bfc73eac7b860cdaf6aa44
(cherry picked from commit afd5f231ae819e6afd5ad4f1b6f961cdc1025bcf)
diff --git a/runtime/test/TestCompilationCaching.cpp b/runtime/test/TestCompilationCaching.cpp
index d69637a..588f0d9 100644
--- a/runtime/test/TestCompilationCaching.cpp
+++ b/runtime/test/TestCompilationCaching.cpp
@@ -15,6 +15,7 @@
*/
#include <HalInterfaces.h>
+#include <SampleDriver.h>
#include <android-base/scopeguard.h>
#include <gtest/gtest.h>
@@ -28,7 +29,6 @@
#include "HalUtils.h"
#include "Manager.h"
-#include "SampleDriver.h"
#include "TestNeuralNetworksWrapper.h"
using namespace android::nn;
diff --git a/runtime/test/TestExecution.cpp b/runtime/test/TestExecution.cpp
index 203e970..97b08e4 100644
--- a/runtime/test/TestExecution.cpp
+++ b/runtime/test/TestExecution.cpp
@@ -15,6 +15,7 @@
*/
#include <HalInterfaces.h>
+#include <SampleDriver.h>
#include <ValidateHal.h>
#include <gtest/gtest.h>
@@ -35,7 +36,6 @@
#include "ModelBuilder.h"
#include "NeuralNetworks.h"
#include "PreparedModelCallback.h"
-#include "SampleDriver.h"
#include "TestNeuralNetworksWrapper.h"
namespace android {
diff --git a/runtime/test/TestExtensions.cpp b/runtime/test/TestExtensions.cpp
index 918c843..2cfcf72 100644
--- a/runtime/test/TestExtensions.cpp
+++ b/runtime/test/TestExtensions.cpp
@@ -15,6 +15,7 @@
*/
#include <HalInterfaces.h>
+#include <SampleDriver.h>
#include <gtest/gtest.h>
#include <string>
@@ -25,7 +26,6 @@
#include "Manager.h"
#include "NeuralNetworks.h"
#include "NeuralNetworksExtensions.h"
-#include "SampleDriver.h"
#include "TypeManager.h"
namespace {
diff --git a/runtime/test/TestFailingDriver.cpp b/runtime/test/TestFailingDriver.cpp
index 0e28efa..2c76cf3 100644
--- a/runtime/test/TestFailingDriver.cpp
+++ b/runtime/test/TestFailingDriver.cpp
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#include <SampleDriverPartial.h>
#include <gtest/gtest.h>
#include <algorithm>
@@ -24,7 +25,6 @@
#include "ExecutionPlan.h"
#include "HalUtils.h"
#include "Manager.h"
-#include "SampleDriverPartial.h"
#include "TestNeuralNetworksWrapper.h"
namespace android::nn {
diff --git a/runtime/test/TestIntrospectionControl.cpp b/runtime/test/TestIntrospectionControl.cpp
index 3da4530..9125371 100644
--- a/runtime/test/TestIntrospectionControl.cpp
+++ b/runtime/test/TestIntrospectionControl.cpp
@@ -16,6 +16,7 @@
#include <ExecutionBurstServer.h>
#include <HalInterfaces.h>
+#include <SampleDriver.h>
#include <ValidateHal.h>
#include <gtest/gtest.h>
@@ -36,7 +37,6 @@
#include "Manager.h"
#include "NeuralNetworks.h"
#include "NeuralNetworksOEM.h"
-#include "SampleDriver.h"
#include "TestNeuralNetworksWrapper.h"
namespace {
diff --git a/runtime/test/TestMemoryDomain.cpp b/runtime/test/TestMemoryDomain.cpp
index cd57126..e231467 100644
--- a/runtime/test/TestMemoryDomain.cpp
+++ b/runtime/test/TestMemoryDomain.cpp
@@ -15,6 +15,8 @@
*/
#include <HalInterfaces.h>
+#include <SampleDriver.h>
+#include <SampleDriverFull.h>
#include <android/hardware/neuralnetworks/1.2/ADevice.h>
#include <gtest/gtest.h>
@@ -29,8 +31,6 @@
#include "HalUtils.h"
#include "Manager.h"
#include "Memory.h"
-#include "SampleDriver.h"
-#include "SampleDriverFull.h"
#include "TestNeuralNetworksWrapper.h"
#include "TestUtils.h"
diff --git a/runtime/test/TestPartitioning.cpp b/runtime/test/TestPartitioning.cpp
index f428aea..bb5bd2d 100644
--- a/runtime/test/TestPartitioning.cpp
+++ b/runtime/test/TestPartitioning.cpp
@@ -16,6 +16,7 @@
#include <ControlFlow.h>
#include <HalInterfaces.h>
+#include <SampleDriver.h>
#include <Utils.h>
#include <ValidateHal.h>
#include <gtest/gtest.h>
@@ -40,7 +41,6 @@
#include "ModelBuilder.h"
#include "NeuralNetworks.h"
#include "NeuralNetworksOEM.h"
-#include "SampleDriver.h"
#include "TestNeuralNetworksWrapper.h"
// Uncomment the following line to generate some debugging output that
diff --git a/runtime/test/TestPartitioningRandom.cpp b/runtime/test/TestPartitioningRandom.cpp
index 9937028..f3412d8 100644
--- a/runtime/test/TestPartitioningRandom.cpp
+++ b/runtime/test/TestPartitioningRandom.cpp
@@ -15,6 +15,7 @@
*/
#include <HalInterfaces.h>
+#include <SampleDriver.h>
#include <ValidateHal.h>
#include <android-base/logging.h>
#include <android/hardware/neuralnetworks/1.0/ADevice.h>
@@ -41,7 +42,6 @@
#include "Manager.h"
#include "ModelBuilder.h"
#include "NeuralNetworks.h"
-#include "SampleDriver.h"
#include "TestNeuralNetworksWrapper.h"
// Uncomment the following line to generate some debugging output that
diff --git a/runtime/test/TestRemoveDefaultArguments.cpp b/runtime/test/TestRemoveDefaultArguments.cpp
index eb99bbb..efe3497 100644
--- a/runtime/test/TestRemoveDefaultArguments.cpp
+++ b/runtime/test/TestRemoveDefaultArguments.cpp
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#include <SampleDriverPartial.h>
#include <Utils.h>
#include <gtest/gtest.h>
@@ -26,7 +27,6 @@
#include "GeneratedTestUtils.h"
#include "HalUtils.h"
#include "Manager.h"
-#include "SampleDriverPartial.h"
#include "TestNeuralNetworksWrapper.h"
namespace generated_tests::avg_pool_v1_2 {
diff --git a/runtime/test/android_fuzzing/DriverFuzzTest.cpp b/runtime/test/android_fuzzing/DriverFuzzTest.cpp
index 5f0cc2a..16df014 100644
--- a/runtime/test/android_fuzzing/DriverFuzzTest.cpp
+++ b/runtime/test/android_fuzzing/DriverFuzzTest.cpp
@@ -15,6 +15,7 @@
*/
#include <MemoryUtils.h>
+#include <SampleDriverFull.h>
#include <Utils.h>
#include <android-base/logging.h>
#include <android/hardware/neuralnetworks/1.3/IDevice.h>
@@ -28,7 +29,6 @@
#include <utility>
#include <vector>
-#include "SampleDriverFull.h"
#include "TestHarness.h"
namespace {
diff --git a/runtime/test/fibonacci_extension/FibonacciDriver.h b/runtime/test/fibonacci_extension/FibonacciDriver.h
index 8ca09e6..28b55d8 100644
--- a/runtime/test/fibonacci_extension/FibonacciDriver.h
+++ b/runtime/test/fibonacci_extension/FibonacciDriver.h
@@ -19,8 +19,7 @@
#include <HalInterfaces.h>
#include <OperationResolver.h>
-
-#include "SampleDriver.h"
+#include <SampleDriver.h>
namespace android {
namespace nn {
diff --git a/runtime/test/fuzzing/TestRandomGraph.cpp b/runtime/test/fuzzing/TestRandomGraph.cpp
index 667cb23..34eb9f3 100644
--- a/runtime/test/fuzzing/TestRandomGraph.cpp
+++ b/runtime/test/fuzzing/TestRandomGraph.cpp
@@ -33,13 +33,13 @@
#ifndef NNTEST_CTS
#include <HalInterfaces.h>
+#include <SampleDriverFull.h>
#include <memunreachable/memunreachable.h>
#include <vector>
#include "HalUtils.h"
#include "Manager.h"
-#include "SampleDriverFull.h"
using android::nn::sample_driver::SampleDriverFull;
