commit 5ae78299f117a61c48a67c5381341501571a0b03
author Guillaume Gardet <guillaume.gardet@arm.com> Tue Oct 15 08:47:26 2019 +0200
committer Matteo Martincigh <matteo.martincigh@arm.com> Thu Oct 17 13:46:03 2019 +0100
tree ad0b4f11ee1f97e59a0f7317ba6c7801b0a64d67
parent 6598427f7dc68f2c9ef6d683e80ec4627df52d58

Move version definition to its own file

 * Move the ArmNN version to a separate ArmnnVersion.txt file
 * Updated makefiles accordingly

!referencetests:206978
!android-nn-driver:2110

Signed-off-by: Guillaume Gardet <guillaume.gardet@arm.com>
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
Change-Id: Ib1a34d38b5f4c7490108ea91d930cf5417d1ca94

Android.mk

diff --git a/Android.mk b/Android.mk
index 93402ff..b2a4233 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,7 +6,6 @@
 LOCAL_PATH := $(call my-dir)
 
 # Configure these paths if you move the source or Khronos headers
-#
 OPENCL_HEADER_PATH := $(LOCAL_PATH)/../clframework/include
 NN_HEADER_PATH := $(LOCAL_PATH)/../../../../frameworks/ml/nn/runtime/include
 ARMNN_HEADER_PATH := $(LOCAL_PATH)/include
@@ -24,6 +23,11 @@
 ARMNN_BACKEND_MAKEFILE_PATHS := $(subst $(LOCAL_PATH),,$(ARMNN_BACKEND_MAKEFILE_LOCAL_PATHS))
 ARMNN_BACKEND_MAKEFILE_DIRS := $(subst /backend.mk,,$(ARMNN_BACKEND_MAKEFILE_PATHS))
 
+# Get ArmNN's version from file
+get_version_number = $(shell sed -n 's/.*$1  *\([0-9*]\)/\1/p' $(LOCAL_PATH)/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 armnn ARMNN_VERSION: $(ARMNN_VERSION))
+
 ##############
 # libarmnn.a #
 ##############
@@ -207,7 +211,9 @@
         -std=$(CPP_VERSION) \
         -fexceptions \
         -Wno-unused-parameter \
-        -frtti
+        -frtti \
+        -DARMNN_VERSION_FROM_FILE=$(ARMNN_VERSION)
+
 # The variable to enable/disable the CL backend (ARMNN_COMPUTE_CL_ENABLED) is declared in android-nn-driver/Android.mk
 ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1)
 LOCAL_CFLAGS += \
@@ -280,7 +286,9 @@
         -std=$(CPP_VERSION) \
         -fexceptions \
         -frtti \
-        -isystem vendor/arm/android-nn-driver/boost_1_64_0
+        -isystem vendor/arm/android-nn-driver/boost_1_64_0 \
+        -DARMNN_VERSION_FROM_FILE=$(ARMNN_VERSION)
+
 # The variable to enable/disable the CL backend (ARMNN_COMPUTE_CL_ENABLED) is declared in android-nn-driver/Android.mk
 ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1)
 LOCAL_CFLAGS += \