commit deb3bdbe028a59da0759dd7a560387d03a11d322
author surmeh01 <surabhi.mehta@arm.com> Thu Jul 05 12:06:04 2018 +0100
committer surmeh01 <surabhi.mehta@arm.com> Thu Jul 05 12:06:04 2018 +0100
tree 869b7ee10d8f1f19a0861e0b552bb453330adf0a
parent 49b9e100bfbb3b8da01472a0ff48b2bd92944e01

Release 18.05.02

test/Android.mk

diff --git a/test/Android.mk b/test/Android.mk
index d74afec..97e9a90 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -61,6 +61,13 @@
 	android.hidl.memory@1.0 \
 	libOpenCL
 
+ifeq ($(PLATFORM_VERSION),9)
+# Required to build the 1.0 version of the NN Driver on Android P and later versions,
+# 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
+
 LOCAL_MODULE := armnn-driver-tests
 
 LOCAL_MODULE_TAGS := eng optional