From cf98577e20506f21e877719665c3abd8874253f6 Mon Sep 17 00:00:00 2001
From: Cathal Corbett <cathal.corbett@arm.com>
Date: Tue, 9 Aug 2022 12:12:17 +0100
Subject: IVGCVSW-7140 Produce map file for AndroidNN build for debug and
 release.

Signed-off-by: Cathal Corbett <cathal.corbett@arm.com>
Change-Id: Ib4433767ba8bd3282a9b19c2a85ff1a6e7e83df5
---
 Android.mk     | 5 ++---
 CMakeLists.txt | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Android.mk b/Android.mk
index 74a6deeb8f..426a62820f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -297,11 +297,10 @@ LOCAL_CFLAGS := \
         -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 7061c603a2..30e526ccfb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -464,7 +464,7 @@ endif()
 
 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 ")
-- 
cgit v1.2.1