diff options
| author | Sadik Armagan <sadik.armagan@arm.com> | 2019-05-15 12:52:19 +0100 |
|---|---|---|
| committer | Sadik Armagan <sadik.armagan@arm.com> | 2019-05-15 12:52:19 +0100 |
| commit | bab2626e4ad7042b449b5ff83cc990d71e4b8fa0 (patch) | |
| tree | 2d751195eb81df7125927f7f17e488efa9ad84dd | |
| parent | da47048a4ec5c7deaa29ff0313c42163993119de (diff) | |
| download | armnn-bab2626e4ad7042b449b5ff83cc990d71e4b8fa0.tar.gz | |
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>
| -rw-r--r-- | Android.mk | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 3d69a0411c..d57e486b99 100644 --- a/Android.mk +++ b/Android.mk @@ -30,7 +30,12 @@ ARMNN_BACKEND_MAKEFILE_DIRS := $(subst /backend.mk,,$(ARMNN_BACKEND_MAKEFILE_PAT 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 $(BUILD_STATIC_LIBRARY) 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 @@ LOCAL_SHARED_LIBRARIES := \ 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) |