diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2018-08-31 16:18:19 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-09-18 12:40:38 +0100 |
| commit | 69558df6f149647888267caabf72de6b05fb6d53 (patch) | |
| tree | 988de8315ae2a1916fb76a6664910e5d4d41c940 /Android.mk | |
| parent | 3b0a2dad430654b0ad4124e5055a92d7c19ae786 (diff) | |
| download | android-nn-driver-69558df6f149647888267caabf72de6b05fb6d53.tar.gz | |
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
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 24 |
1 files changed, 17 insertions, 7 deletions
@@ -40,11 +40,11 @@ ifeq ($(PLATFORM_VERSION),9) # regardless of the HAL version used for the build. LOCAL_CFLAGS+= \ -DARMNN_ANDROID_P -endif +endif # PLATFORM_VERSION == 9 ifeq ($(ARMNN_DRIVER_DEBUG),1) LOCAL_CFLAGS+= \ -UNDEBUG -endif +endif # ARMNN_DRIVER_DEBUG == 1 LOCAL_SRC_FILES := \ 1.0/ArmnnDriverImpl.cpp \ @@ -80,10 +80,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_STATIC_LIBRARY) +ifeq ($(PLATFORM_VERSION),9) +# The following target is available starting from Android P + ####################### # libarmnn-driver@1.1 # ####################### @@ -112,7 +115,7 @@ LOCAL_CFLAGS := \ ifeq ($(ARMNN_DRIVER_DEBUG),1) LOCAL_CFLAGS+= \ -UNDEBUG -endif +endif # ARMNN_DRIVER_DEBUG == 1 LOCAL_SRC_FILES := \ 1.0/ArmnnDriverImpl.cpp \ @@ -148,6 +151,8 @@ LOCAL_SHARED_LIBRARIES := \ include $(BUILD_STATIC_LIBRARY) +endif # PLATFORM_VERSION == 9 + ##################################################### # android.hardware.neuralnetworks@1.0-service-armnn # ##################################################### @@ -172,7 +177,7 @@ LOCAL_CFLAGS := \ ifeq ($(ARMNN_DRIVER_DEBUG),1) LOCAL_CFLAGS += \ -UNDEBUG -endif +endif # ARMNN_DRIVER_DEBUG == 1 LOCAL_SRC_FILES := \ service.cpp @@ -206,10 +211,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 + ##################################################### # android.hardware.neuralnetworks@1.1-service-armnn # ##################################################### @@ -235,7 +243,7 @@ LOCAL_CFLAGS := \ ifeq ($(ARMNN_DRIVER_DEBUG),1) LOCAL_CFLAGS += \ -UNDEBUG -endif +endif # ARMNN_DRIVER_DEBUG == 1 LOCAL_SRC_FILES := \ service.cpp @@ -268,6 +276,8 @@ LOCAL_SHARED_LIBRARIES := \ include $(BUILD_EXECUTABLE) +endif # PLATFORM_VERSION == 9 + ########################## # armnn module and tests # ########################## |