From deb3bdbe028a59da0759dd7a560387d03a11d322 Mon Sep 17 00:00:00 2001
From: surmeh01 <surabhi.mehta@arm.com>
Date: Thu, 5 Jul 2018 12:06:04 +0100
Subject: Release 18.05.02

---
 test/Android.mk | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'test/Android.mk')

diff --git a/test/Android.mk b/test/Android.mk
index d74afecc..97e9a903 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -61,6 +61,13 @@ LOCAL_SHARED_LIBRARIES :=  \
 	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
-- 
cgit v1.2.1