diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-10-18 14:59:19 +0100 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-10-18 15:45:45 +0100 |
| commit | bccc3450179402ea0cf608171833dbc4f297056f (patch) | |
| tree | 26395c63d76518886f28a0778c7233f7526e9e0a /Android.mk | |
| parent | ed25e0e8932895686ffb5166966beb88ddcbd410 (diff) | |
| download | armnn-bccc3450179402ea0cf608171833dbc4f297056f.tar.gz | |
Github #275 Generate versionned libraries
* Improved parsing of the ArmNN's version at compile time
* Reading the version directly from the Version.hpp file, to
make sure not to break any build made with a different
build system than CMake (or Ninja)
* The version macro is set in the Version.hpp just like before,
so setting it from the command line is no longer necessary
!android-nn-driver:2126
Signed-off-by: Guillaume Gardet <guillaume.gardet@arm.com>
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
Change-Id: I0820094607734d283ded030e4ded0ae6f5889c86
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Android.mk b/Android.mk index b2a4233a4d..81a77e21bc 100644 --- a/Android.mk +++ b/Android.mk @@ -23,11 +23,6 @@ ARMNN_BACKEND_MAKEFILE_LOCAL_PATHS := $(wildcard $(LOCAL_PATH)/src/backends/*/ba 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 # ############## @@ -211,8 +206,7 @@ LOCAL_CFLAGS := \ -std=$(CPP_VERSION) \ -fexceptions \ -Wno-unused-parameter \ - -frtti \ - -DARMNN_VERSION_FROM_FILE=$(ARMNN_VERSION) + -frtti # 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) @@ -286,8 +280,7 @@ LOCAL_CFLAGS := \ -std=$(CPP_VERSION) \ -fexceptions \ -frtti \ - -isystem vendor/arm/android-nn-driver/boost_1_64_0 \ - -DARMNN_VERSION_FROM_FILE=$(ARMNN_VERSION) + -isystem vendor/arm/android-nn-driver/boost_1_64_0 # 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) |