commit bab2626e4ad7042b449b5ff83cc990d71e4b8fa0
author Sadik Armagan <sadik.armagan@arm.com> Wed May 15 12:52:19 2019 +0100
committer Sadik Armagan <sadik.armagan@arm.com> Wed May 15 12:52:19 2019 +0100
tree 2d751195eb81df7125927f7f17e488efa9ad84dd
parent da47048a4ec5c7deaa29ff0313c42163993119de

IVGCVSW-2911 Add Android Q support to android-nn-driver infrastructure

 * Updated Android.mk for Android Q build support

Change-Id: Ie3ba0b76d86c050e84b08cda4373474718d834a2
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>

Android.mk

diff --git a/Android.mk b/Android.mk
index 3d69a04..d57e486 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,7 +30,12 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libarmnn
+ifeq ($(PLATFORM_VERSION),Q)
+# "eng" is deprecated in Android Q
+LOCAL_MODULE_TAGS := optional
+else
 LOCAL_MODULE_TAGS := eng optional
+endif
 LOCAL_ARM_MODE := arm
 LOCAL_PROPRIETARY_MODULE := true
 
@@ -184,7 +189,12 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := armnn-tests
+ifeq ($(PLATFORM_VERSION),Q)
+# "eng" is deprecated in Android Q
+LOCAL_MODULE_TAGS := optional
+else
 LOCAL_MODULE_TAGS := eng optional
+endif
 LOCAL_ARM_MODE := arm
 LOCAL_PROPRIETARY_MODULE := true
 
@@ -269,7 +279,11 @@
         libutils \
         android.hardware.neuralnetworks@1.0 \
         android.hidl.allocator@1.0 \
-        android.hidl.memory@1.0 \
+        android.hidl.memory@1.0
+
+ifneq ($(PLATFORM_VERSION),Q)
+LOCAL_SHARED_LIBRARIES += \
         libOpenCL
+endif
 
 include $(BUILD_EXECUTABLE)