diff --git a/Android.mk b/Android.mk
index 74a6dee..426a628 100644
--- a/Android.mk
+++ b/Android.mk
@@ -297,11 +297,10 @@
         -Wno-unused-parameter \
         -frtti \
         -DFMT_HEADER_ONLY
-        
-ifeq ($(ARMNN_DRIVER_DEBUG),1)
+
 LOCAL_LDFLAGS += \
                 -Wl,-Map=libarmnnMapFile.map
-endif # ARMNN_DRIVER_DEBUG == 1
+
 # 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 += \
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7061c60..30e526c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -464,7 +464,7 @@
 
 target_compile_definitions(armnn PRIVATE "ARMNN_COMPILING_DLL")
 
-# Generate a map file for debug mode only
+# Generate a map file for all build modes
 set_property(TARGET armnn APPEND_STRING PROPERTY
         LINK_FLAGS " -Wl,-Map=libarmnnMapFile.map")
 message(STATUS "Linker will generate mapfile ")