diff options
Diffstat (limited to 'test/Android.mk')
| -rw-r--r-- | test/Android.mk | 38 |
1 files changed, 33 insertions, 5 deletions
diff --git a/test/Android.mk b/test/Android.mk index 2b87a41d..1da26e40 100644 --- a/test/Android.mk +++ b/test/Android.mk @@ -8,12 +8,16 @@ LOCAL_PATH := $(call my-dir) # Configure these paths if you move the source or Khronos headers # OPENCL_HEADER_PATH := $(LOCAL_PATH)/../../mali/product/khronos/original -NN_HEADER_PATH := $(LOCAL_PATH)/../../../../frameworks/ml/nn/runtime/include ARMNN_HEADER_PATH := $(LOCAL_PATH)/../armnn/include ARMNN_THIRD_PARTY_PATH := $(LOCAL_PATH)/../armnn/third-party ARMNN_UTILS_HEADER_PATH := $(LOCAL_PATH)/../armnn/src/armnnUtils ARMNN_DRIVER_HEADER_PATH := $(LOCAL_PATH)/.. +NN_HEADER_PATH := $(LOCAL_PATH)/../../../../frameworks/ml/nn/runtime/include +ifeq ($(S_OR_LATER),1) +NN_HEADER_PATH := $(LOCAL_PATH)/../../../../packages/modules/NeuralNetworks/runtime/include +endif + ########################## # armnn-driver-tests@1.0 # ########################## @@ -47,11 +51,16 @@ LOCAL_CFLAGS := \ -UNDEBUG # Required to build with the changes made to the Android ML framework specific to Android R -ifeq ($(R_OR_LATER),1) +ifeq ($(ANDROID_R),1) LOCAL_CFLAGS+= \ -DARMNN_ANDROID_R endif # R or later +ifeq ($(ANDROID_S),1) +LOCAL_CFLAGS+= \ + -DARMNN_ANDROID_S +endif # S or later + ifeq ($(Q_OR_LATER),1) LOCAL_CFLAGS += \ -DBOOST_NO_AUTO_PTR @@ -159,11 +168,16 @@ LOCAL_CFLAGS := \ -DARMNN_ANDROID_NN_V1_1 # Required to build with the changes made to the Android ML framework specific to Android R -ifeq ($(R_OR_LATER),1) +ifeq ($(ANDROID_R),1) LOCAL_CFLAGS+= \ -DARMNN_ANDROID_R endif # R or later +ifeq ($(ANDROID_S),1) +LOCAL_CFLAGS+= \ + -DARMNN_ANDROID_S +endif # S or later + ifeq ($(Q_OR_LATER),1) LOCAL_CFLAGS += \ -DBOOST_NO_AUTO_PTR @@ -267,11 +281,16 @@ LOCAL_CFLAGS := \ -DARMNN_ANDROID_NN_V1_2 # Required to build with the changes made to the Android ML framework specific to Android R -ifeq ($(R_OR_LATER),1) +ifeq ($(ANDROID_R),1) LOCAL_CFLAGS+= \ -DARMNN_ANDROID_R endif # R or later +ifeq ($(ANDROID_S),1) +LOCAL_CFLAGS+= \ + -DARMNN_ANDROID_S +endif # S or later + LOCAL_SRC_FILES := \ 1.0/Convolution2D.cpp \ 1.1/Convolution2D.cpp \ @@ -366,9 +385,18 @@ LOCAL_CFLAGS := \ -O0 \ -UNDEBUG \ -DBOOST_NO_AUTO_PTR \ - -DARMNN_ANDROID_R \ -DARMNN_ANDROID_NN_V1_3 +ifeq ($(ANDROID_R),1) +LOCAL_CFLAGS+= \ + -DARMNN_ANDROID_R +endif + +ifeq ($(ANDROID_S),1) +LOCAL_CFLAGS+= \ + -DARMNN_ANDROID_S +endif + LOCAL_SRC_FILES := \ 1.0/Convolution2D.cpp \ 1.1/Convolution2D.cpp \ |