From ffdae27de9d0e4606738f7e725612a24910f2142 Mon Sep 17 00:00:00 2001 From: Matteo Martincigh Date: Wed, 16 Oct 2019 16:24:43 +0100 Subject: Move version definition to its own file * Move the ArmNN version to a separate ArmnnVersion.txt file * Updated makefiles accordingly !referencetests:206978 !armnn:2089 Signed-off-by: Matteo Martincigh Change-Id: I02b838bc71611a866b3f96335e44a33b0167134f --- test/Android.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/Android.mk b/test/Android.mk index 93bfa695..68e8c7db 100644 --- a/test/Android.mk +++ b/test/Android.mk @@ -12,6 +12,11 @@ NN_HEADER_PATH := $(LOCAL_PATH)/../../../../frameworks/ml/nn/runtime/include ARMNN_HEADER_PATH := $(LOCAL_PATH)/../armnn/include ARMNN_DRIVER_HEADER_PATH := $(LOCAL_PATH)/.. +# Get ArmNN's version from file +get_version_number = $(shell sed -n 's/.*$1 *\([0-9*]\)/\1/p' $(LOCAL_PATH)/../armnn/ArmnnVersion.txt) +ARMNN_VERSION := 20$(call get_version_number,ARMNN_MAJOR_VERSION)$(call get_version_number,ARMNN_MINOR_VERSION)$(call get_version_number,ARMNN_PATCH_VERSION) +$(info android-nn-driver/test ARMNN_VERSION: $(ARMNN_VERSION)) + ########################## # armnn-driver-tests@1.0 # ########################## @@ -40,7 +45,8 @@ LOCAL_CFLAGS := \ -fexceptions \ -Werror \ -O0 \ - -UNDEBUG + -UNDEBUG \ + -DARMNN_VERSION_FROM_FILE=$(ARMNN_VERSION) ifeq ($(P_OR_LATER),1) # Required to build with the changes made to the Android ML framework starting from Android P, @@ -148,6 +154,7 @@ LOCAL_CFLAGS := \ -Werror \ -O0 \ -UNDEBUG \ + -DARMNN_VERSION_FROM_FILE=$(ARMNN_VERSION) \ -DARMNN_ANDROID_P \ -DARMNN_ANDROID_NN_V1_1 @@ -245,6 +252,7 @@ LOCAL_CFLAGS := \ -Werror \ -O0 \ -UNDEBUG \ + -DARMNN_VERSION_FROM_FILE=$(ARMNN_VERSION) \ -DARMNN_ANDROID_Q \ -DARMNN_ANDROID_NN_V1_2 -- cgit v1.2.1