commit a5f9e76b991d9d69d3242b26be137956d0f4d0a8
author Matteo Martincigh <matteo.martincigh@arm.com> Mon Jun 17 13:26:34 2019 +0100
committer Matteo Martincigh <matteo.martincigh@arm.com> Mon Jun 17 14:56:39 2019 +0100
tree 16e376328203787d604b0b2f9c61509e7c09b67d
parent 44cfd848c1913f87a77c0427450dba93ba47fb94

IVGCVSW-2779 Fix Android Q build

 * Included required functions to the Android Q build by using macro
   ARMNN_ANDROID_NN_V1_2

Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
Change-Id: I3ea99ba4bebd85f0e8e69c72a90e1a7def4f9b35

test/Convolution2D.hpp

diff --git a/test/Convolution2D.hpp b/test/Convolution2D.hpp
index ec43ae3..46b4654 100644
--- a/test/Convolution2D.hpp
+++ b/test/Convolution2D.hpp
@@ -32,7 +32,7 @@
 
 void SetModelFp16Flag(V1_0::Model& model, bool fp16Enabled);
 
-#ifdef ARMNN_ANDROID_NN_V1_1
+#if defined(ARMNN_ANDROID_NN_V1_1) || defined(ARMNN_ANDROID_NN_V1_2)
 void SetModelFp16Flag(V1_1::Model& model, bool fp16Enabled);
 #endif
 

test/DriverTestHelpers.cpp

diff --git a/test/DriverTestHelpers.cpp b/test/DriverTestHelpers.cpp
index 7a6b780..675757f 100644
--- a/test/DriverTestHelpers.cpp
+++ b/test/DriverTestHelpers.cpp
@@ -126,7 +126,7 @@
     return cb->GetPreparedModel();
 }
 
-#ifdef ARMNN_ANDROID_NN_V1_1
+#if defined(ARMNN_ANDROID_NN_V1_1) || defined(ARMNN_ANDROID_NN_V1_2)
 
 android::sp<V1_0::IPreparedModel> PrepareModelWithStatus(const V1_1::Model& model,
                                                          armnn_driver::ArmnnDriver& driver,

test/DriverTestHelpers.hpp

diff --git a/test/DriverTestHelpers.hpp b/test/DriverTestHelpers.hpp
index 428359e..980b3a7 100644
--- a/test/DriverTestHelpers.hpp
+++ b/test/DriverTestHelpers.hpp
@@ -242,12 +242,12 @@
                                                          ErrorStatus& prepareStatus,
                                                          ErrorStatus expectedStatus = ErrorStatus::NONE);
 
-#ifdef ARMNN_ANDROID_NN_V1_1
+#if defined(ARMNN_ANDROID_NN_V1_1) || defined(ARMNN_ANDROID_NN_V1_2)
 
 android::sp<V1_0::IPreparedModel> PrepareModelWithStatus(const V1_1::Model& model,
-                                                   armnn_driver::ArmnnDriver& driver,
-                                                   ErrorStatus& prepareStatus,
-                                                   ErrorStatus expectedStatus = ErrorStatus::NONE);
+                                                         armnn_driver::ArmnnDriver& driver,
+                                                         ErrorStatus& prepareStatus,
+                                                         ErrorStatus expectedStatus = ErrorStatus::NONE);
 
 #endif