diff options
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) |