From 69558df6f149647888267caabf72de6b05fb6d53 Mon Sep 17 00:00:00 2001 From: Matteo Martincigh Date: Fri, 31 Aug 2018 16:18:19 +0100 Subject: 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 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/Android.mk b/test/Android.mk index 1cef3787..f96577c5 100644 --- a/test/Android.mk +++ b/test/Android.mk @@ -41,7 +41,7 @@ ifeq ($(PLATFORM_VERSION),9) # 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 @@ ifeq ($(PLATFORM_VERSION),9) # 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 @@ LOCAL_SHARED_LIBRARIES := \ include $(BUILD_EXECUTABLE) +endif # PLATFORM_VERSION == 9 + -- cgit v1.2.1