From 4d05ae79d6f33a4bbf60e605ddb9d16dddda8397 Mon Sep 17 00:00:00 2001 From: Matteo Martincigh Date: Fri, 18 Oct 2019 15:04:03 +0100 Subject: Github #275 Improved getting ArmNN's version at compile time * The version macro is set in the Version.hpp just like before, so parsing it from file is no longer necessary !armnn:2090 Signed-off-by: Matteo Martincigh Change-Id: I3f8d10bd7b8947f9361e50edf033ea4e93451faf --- test/Android.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'test') diff --git a/test/Android.mk b/test/Android.mk index 68e8c7db..93bfa695 100644 --- a/test/Android.mk +++ b/test/Android.mk @@ -12,11 +12,6 @@ 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 # ########################## @@ -45,8 +40,7 @@ LOCAL_CFLAGS := \ -fexceptions \ -Werror \ -O0 \ - -UNDEBUG \ - -DARMNN_VERSION_FROM_FILE=$(ARMNN_VERSION) + -UNDEBUG ifeq ($(P_OR_LATER),1) # Required to build with the changes made to the Android ML framework starting from Android P, @@ -154,7 +148,6 @@ LOCAL_CFLAGS := \ -Werror \ -O0 \ -UNDEBUG \ - -DARMNN_VERSION_FROM_FILE=$(ARMNN_VERSION) \ -DARMNN_ANDROID_P \ -DARMNN_ANDROID_NN_V1_1 @@ -252,7 +245,6 @@ LOCAL_CFLAGS := \ -Werror \ -O0 \ -UNDEBUG \ - -DARMNN_VERSION_FROM_FILE=$(ARMNN_VERSION) \ -DARMNN_ANDROID_Q \ -DARMNN_ANDROID_NN_V1_2 -- cgit v1.2.1