commit 69558df6f149647888267caabf72de6b05fb6d53
author Matteo Martincigh <matteo.martincigh@arm.com> Fri Aug 31 16:18:19 2018 +0100
committer Matthew Bentham <matthew.bentham@arm.com> Tue Sep 18 12:40:38 2018 +0100
tree 988de8315ae2a1916fb76a6664910e5d4d41c940
parent 3b0a2dad430654b0ad4124e5055a92d7c19ae786

Fix for building the NN Driver correctly without having to set
ALLOW_MISSING_DEPENDENCIES to true on Android versions that don't
provide all the HAL versions supported by the NN Driver

Change-Id: I7c828649499ca1d7cb26feb93f559e9f1eae33c7

test/Android.mk

diff --git a/test/Android.mk b/test/Android.mk
index 1cef378..f96577c 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -41,7 +41,7 @@
 # regardless of the HAL version used for the build.
 LOCAL_CFLAGS+= \
         -DARMNN_ANDROID_P
-endif
+endif # PLATFORM_VERSION == 9
 
 LOCAL_SRC_FILES := \
         Tests.cpp \
@@ -83,10 +83,13 @@
 # as the 1.0 version of the NN API needs the 1.1 HAL headers to be included regardless.
 LOCAL_SHARED_LIBRARIES+= \
         android.hardware.neuralnetworks@1.1
-endif
+endif # PLATFORM_VERSION == 9
 
 include $(BUILD_EXECUTABLE)
 
+ifeq ($(PLATFORM_VERSION),9)
+# The following target is available starting from Android P
+
 ##########################
 # armnn-driver-tests@1.1 #
 ##########################
@@ -153,3 +156,5 @@
 
 include $(BUILD_EXECUTABLE)
 
+endif # PLATFORM_VERSION == 9
+