Do not generate exec link map files by default

build/toolchain/android/android_toolchain.gni

@@ -69,6 +69,5 @@ template("android_clang_toolchain") {
     ar = _ndk_prefix + "llvm-ar"
     cc = _ndk_prefix + _tool_name_root + "clang"
     cxx = _ndk_prefix + _tool_name_root + "clang++"
-    link_generate_map_file = false
   }
 }

build/toolchain/gcc_toolchain.gni

@@ -16,11 +16,9 @@ import("//build_overrides/pigweed.gni")
 import("$dir_pw_toolchain/generate_toolchain.gni")
 
 declare_args() {
-  # Generate Linker map files. Can skip since they can
+  # Generate Linker map files. By default it is disabled since they can
   # be quite large.
-  #
-  # Note that toolchains can individually override this
-  chip_generate_link_map_file = true
+  chip_generate_link_map_file = false
 }
 
 template("gcc_toolchain") {
@@ -48,11 +46,7 @@ template("gcc_toolchain") {
       cxx = invoker.cxx
     }
 
-    if (defined(invoker.link_generate_map_file)) {
-      link_generate_map_file = invoker.link_generate_map_file
-    } else {
-      link_generate_map_file = chip_generate_link_map_file
-    }
+    link_generate_map_file = chip_generate_link_map_file
 
     is_host_toolchain = invoker_toolchain_args.current_os == host_os
     link_group = invoker_toolchain_args.current_os != "mac" &&

examples/chef/chef.py

@@ -811,6 +811,7 @@ def main() -> int:
                 'chip_shell_cmd_server = false',
                 'chip_build_libshell = true',
                 'chip_enable_openthread = false',
+                'chip_generate_link_map_file = true',
                 'chip_config_network_layer_ble = false',
                 'chip_device_project_config_include = "<CHIPProjectAppConfig.h>"',
                 'chip_project_config_include = "<CHIPProjectAppConfig.h>"',

scripts/build/build_examples.py

@@ -83,14 +83,17 @@ def ValidateTargetNames(context, parameter, values):
     default=[],
     multiple=True,
     callback=ValidateTargetNames,
-    help='Build target(s)'
-)
+    help='Build target(s)')
+@click.option(
+    '--enable-link-map-file',
+    default=False,
+    is_flag=True,
+    help='Enable generation of link map files.')
 @click.option(
     '--enable-flashbundle',
     default=False,
     is_flag=True,
-    help='Also generate the flashbundles for the app.'
-)
+    help='Also generate the flashbundles for the app.')
 @click.option(
     '--repo',
     default='.',
@@ -132,7 +135,7 @@ def ValidateTargetNames(context, parameter, values):
         'Set pigweed command launcher. E.g.: "--pw-command-launcher=ccache" '
         'for using ccache when building examples.'))
 @click.pass_context
-def main(context, log_level, target, repo,
+def main(context, log_level, target, enable_link_map_file, repo,
          out_prefix, pregen_dir, clean, dry_run, dry_run_output, enable_flashbundle,
          no_log_timestamps, pw_command_launcher):
     # Ensures somewhat pretty logging of what is going on
@@ -160,6 +163,7 @@ def main(context, log_level, target, repo,
     context.obj = build.Context(
         repository_path=repo, output_prefix=out_prefix, runner=runner)
     context.obj.SetupBuilders(targets=requested_targets, options=BuilderOptions(
+        enable_link_map_file=enable_link_map_file,
         enable_flashbundle=enable_flashbundle,
         pw_command_launcher=pw_command_launcher,
         pregen_dir=pregen_dir,

scripts/build/builders/ameba.py

@@ -15,7 +15,7 @@
 import os
 from enum import Enum, auto
 
-from .builder import Builder
+from .builder import Builder, BuilderOutput
 
 
 class AmebaBoard(Enum):
@@ -89,18 +89,19 @@ def _build(self):
                       title='Building ' + self.identifier)
 
     def build_outputs(self):
-        return {
-            self.app.AppNamePrefix + '.axf':
-                os.path.join(self.output_dir, 'asdk', 'target_image2.axf'),
-            self.app.AppNamePrefix + '.map':
+        yield BuilderOutput(
+            os.path.join(self.output_dir, 'asdk', 'target_image2.axf'),
+            self.app.AppNamePrefix + '.axf')
+        if self.options.enable_link_map_file:
+            yield BuilderOutput(
                 os.path.join(self.output_dir, 'asdk', 'target_image2.map'),
-            'km0_boot_all.bin':
-                os.path.join(self.output_dir, 'asdk',
-                             'bootloader', 'km0_boot_all.bin'),
-            'km4_boot_all.bin':
-                os.path.join(self.output_dir, 'asdk',
-                             'bootloader', 'km4_boot_all.bin'),
-            'km0_km4_image2.bin':
-                os.path.join(self.output_dir, 'asdk',
-                             'image', 'km0_km4_image2.bin'),
-        }
+                self.app.AppNamePrefix + '.map')
+        yield BuilderOutput(
+            os.path.join(self.output_dir, 'asdk', 'bootloader', 'km0_boot_all.bin'),
+            'km0_boot_all.bin')
+        yield BuilderOutput(
+            os.path.join(self.output_dir, 'asdk', 'bootloader', 'km4_boot_all.bin'),
+            'km4_boot_all.bin')
+        yield BuilderOutput(
+            os.path.join(self.output_dir, 'asdk', 'image', 'km0_km4_image2.bin'),
+            'km0_km4_image2.bin')

scripts/build/builders/android.py

@@ -16,7 +16,7 @@
 import shlex
 from enum import Enum, auto
 
-from .builder import Builder
+from .builder import Builder, BuilderOutput
 
 
 class AndroidBoard(Enum):
@@ -366,6 +366,9 @@ def generate(self):
             if self.options.pw_command_launcher:
                 gn_args["pw_command_launcher"] = self.options.pw_command_launcher
 
+            if self.options.enable_link_map_file:
+                gn_args["chip_generate_link_map_file"] = True
+
             if exampleName == "chip-test":
                 gn_args["chip_build_tests"] = True
             if self.profile != AndroidProfile.DEBUG:
@@ -569,85 +572,61 @@ def _build(self):
 
     def build_outputs(self):
         if self.board.IsIde():
-            outputs = {
-                self.app.AppName()
-                + "-debug.apk": os.path.join(
+            yield BuilderOutput(
+                os.path.join(
                     self.root,
                     "examples/android",
                     self.app.AppName(),
-                    "app/build/outputs/apk/debug/app-debug.apk",
-                )
-            }
+                    "app/build/outputs/apk/debug/app-debug.apk"),
+                self.app.AppName() + "-debug.apk")
         elif self.app.ExampleName() is not None:
             if self.app == AndroidApp.TV_SERVER:
-                outputs = {
-                    "tv-sever-platform-app-debug.apk": os.path.join(
-                        self.output_dir, "platform-app", "outputs", "apk", "debug", "platform-app-debug.apk"
-                    ),
-                    "tv-sever-content-app-debug.apk": os.path.join(
-                        self.output_dir, "content-app", "outputs", "apk", "debug", "content-app-debug.apk"
-                    )
-                }
+                yield BuilderOutput(
+                    os.path.join(self.output_dir, "platform-app",
+                                 "outputs", "apk", "debug", "platform-app-debug.apk"),
+                    "tv-sever-platform-app-debug.apk")
+                yield BuilderOutput(
+                    os.path.join(self.output_dir, "content-app",
+                                 "outputs", "apk", "debug", "content-app-debug.apk"),
+                    "tv-sever-content-app-debug.apk")
             elif self.app == AndroidApp.VIRTUAL_DEVICE_APP:
-                outputs = {
-                    self.app.AppName() + "app-debug.apk": os.path.join(
-                        self.output_dir, "VirtualDeviceApp", "app", "outputs", "apk", "debug", "app-debug.apk"
-                    )
-                }
+                yield BuilderOutput(
+                    os.path.join(self.output_dir, "VirtualDeviceApp", "app",
+                                 "outputs", "apk", "debug", "app-debug.apk"),
+                    self.app.AppName() + "app-debug.apk")
             else:
-                outputs = {
-                    self.app.AppName() + "app-debug.apk": os.path.join(
-                        self.output_dir, "outputs", "apk", "debug", "app-debug.apk"
-                    )
-                }
+                yield BuilderOutput(
+                    os.path.join(self.output_dir,
+                                 "outputs", "apk", "debug", "app-debug.apk"),
+                    self.app.AppName() + "app-debug.apk")
         else:
-            outputs = {
-                self.app.AppName() + "app-debug.apk": os.path.join(
-                    self.output_dir, "outputs", "apk", "debug", "app-debug.apk"
-                ),
-                "CHIPController.jar": os.path.join(
-                    self.output_dir, "lib", "src/controller/java/CHIPController.jar"
-                ),
-                "CHIPInteractionModel.jar": os.path.join(
-                    self.output_dir, "lib", "src/controller/java/CHIPInteractionModel.jar"
-                ),
-                "libMatterTlv.jar": os.path.join(
-                    self.output_dir, "lib", "src/controller/java/libMatterTlv.jar"
-                ),
-                "AndroidPlatform.jar": os.path.join(
-                    self.output_dir, "lib", "src/platform/android/AndroidPlatform.jar"
-                ),
-                "OnboardingPayload.jar": os.path.join(
-                    self.output_dir,
-                    "lib",
-                    "src/controller/java/OnboardingPayload.jar",
-                ),
-                "CHIPClusters.jar": os.path.join(
-                    self.output_dir,
-                    "lib",
-                    "src/controller/java/CHIPClusters.jar",
-                ),
-                "CHIPClusterID.jar": os.path.join(
-                    self.output_dir,
-                    "lib",
-                    "src/controller/java/CHIPClusterID.jar",
-                ),
-                "jni/%s/libCHIPController.so"
-                % self.board.AbiName(): os.path.join(
-                    self.output_dir,
-                    "lib",
-                    "jni",
-                    self.board.AbiName(),
-                    "libCHIPController.so",
-                ),
-                "jni/%s/libc++_shared.so"
-                % self.board.AbiName(): os.path.join(
-                    self.output_dir,
-                    "lib",
-                    "jni",
-                    self.board.AbiName(),
-                    "libc++_shared.so",
-                ),
-            }
-
-        return outputs
+            yield BuilderOutput(
+                os.path.join(self.output_dir, "outputs", "apk", "debug", "app-debug.apk"),
+                self.app.AppName() + "app-debug.apk")
+            yield BuilderOutput(
+                os.path.join(self.output_dir, "lib", "src", "controller", "java", "CHIPController.jar"),
+                "CHIPController.jar")
+            yield BuilderOutput(
+                os.path.join(self.output_dir, "lib", "src", "controller", "java", "CHIPInteractionModel.jar"),
+                "CHIPInteractionModel.jar")
+            yield BuilderOutput(
+                os.path.join(self.output_dir, "lib", "src", "controller", "java", "libMatterTlv.jar"),
+                "libMatterTlv.jar")
+            yield BuilderOutput(
+                os.path.join(self.output_dir, "lib", "src", "platform", "android", "AndroidPlatform.jar"),
+                "AndroidPlatform.jar")
+            yield BuilderOutput(
+                os.path.join(self.output_dir, "lib", "src", "controller", "java", "OnboardingPayload.jar"),
+                "OnboardingPayload.jar")
+            yield BuilderOutput(
+                os.path.join(self.output_dir, "lib", "src", "controller", "java", "CHIPClusters.jar"),
+                "CHIPClusters.jar")
+            yield BuilderOutput(
+                os.path.join(self.output_dir, "lib", "src", "controller", "java", "CHIPClusterID.jar"),
+                "CHIPClusterID.jar")
+            yield BuilderOutput(
+                os.path.join(self.output_dir, "lib", "jni", self.board.AbiName(), "libCHIPController.so"),
+                "jni/%s/libCHIPController.so" % self.board.AbiName())
+            yield BuilderOutput(
+                os.path.join(self.output_dir, "lib", "jni", self.board.AbiName(), "libc++_shared.so"),
+                "jni/%s/libc++_shared.so" % self.board.AbiName())

scripts/build/builders/asr.py

@@ -15,6 +15,7 @@
 import os
 from enum import Enum, auto
 
+from .builder import BuilderOutput
 from .gn import GnBuilder
 
 
@@ -178,13 +179,9 @@ def GnBuildArgs(self):
         return self.extra_gn_options
 
     def build_outputs(self):
-        items = {
-            '%s.out' % self.app.AppNamePrefix():
-                os.path.join(self.output_dir, '%s.out' %
-                             self.app.AppNamePrefix()),
-            '%s.out.map' % self.app.AppNamePrefix():
-                os.path.join(self.output_dir,
-                             '%s.out.map' % self.app.AppNamePrefix()),
-        }
-
-        return items
+        extensions = ["out"]
+        if self.options.enable_link_map_file:
+            extensions.append("out.map")
+        for ext in extensions:
+            name = f"{self.app.AppNamePrefix()}.{ext}"
+            yield BuilderOutput(os.path.join(self.output_dir, name), name)

scripts/build/builders/bouffalolab.py

@@ -16,6 +16,7 @@
 import os
 from enum import Enum, auto
 
+from .builder import BuilderOutput
 from .gn import GnBuilder
 
 
@@ -226,16 +227,12 @@ def GnBuildArgs(self):
             return self.argsOpt
 
     def build_outputs(self):
-        items = {
-            '%s.out' % self.app.AppNamePrefix(self.chip_name):
-                os.path.join(self.output_dir, '%s.out' %
-                             self.app.AppNamePrefix(self.chip_name)),
-            '%s.out.map' % self.app.AppNamePrefix(self.chip_name):
-                os.path.join(self.output_dir,
-                             '%s.out.map' % self.app.AppNamePrefix(self.chip_name)),
-        }
-
-        return items
+        extensions = ["out"]
+        if self.options.enable_link_map_file:
+            extensions.append("out.map")
+        for ext in extensions:
+            name = f"{self.app.AppNamePrefix(self.chip_name)}.{ext}"
+            yield BuilderOutput(os.path.join(self.output_dir, name), name)
 
     def PostBuildCommand(self):