Fix Mbed OS 2 build for Public/Internal headers relocating

Modify compilation API to provide a list of paths to exclude from
the build.

Author: hugueskamba

tools/build_api.py

@@ -1075,7 +1075,7 @@ def build_mbed_libs(target, toolchain_name, clean=False, macros=None,
         # Build Things
         notify.info("Building library %s (%s, %s)" %
                     ('MBED', target.name, toolchain_name))
-        objects = toolchain.compile_sources(
+        objects = toolchain.compile_legacy_sources(
             mbed_resources, incdirs, exclude_paths
         )
         separate_objects = []

tools/toolchains/mbed_toolchain.py

@@ -395,29 +395,48 @@ def get_arch_file(self, objects):
         cmd_list = (c.replace("\\", "/") for c in objects if c)
         return self.make_option_file(list(cmd_list), ".archive_files.txt")
 
+    def compile_legacy_sources(
+        self, resources, inc_dirs=None, exclude_dirs=None
+    ):
+        """Compile source files with option to exclude some directories.
+
+        This method only exists to not break API compatibility and provide a
+        way to exclude directories for Mbed OS 2 builds.
+        """
+        return self._compile_sources(
+            resources, inc_dirs=inc_dirs, exclude_dirs=exclude_dirs
+        )
+
     # THIS METHOD IS BEING CALLED BY THE MBED ONLINE BUILD SYSTEM
     # ANY CHANGE OF PARAMETERS OR RETURN VALUES WILL BREAK COMPATIBILITY
-    def compile_sources(self, resources, inc_dirs=None, exclude_paths=None):
+    def compile_sources(self, resources, inc_dirs=None):
+        """Compile source files."""
+        return self._compile_sources(resources, inc_dirs=inc_dirs)
+
+    def _exclude_files_from_build(self, files_to_compile, exclude_dirs):
+        """Remove files from dirs to be excluded for the build."""
+        return [
+            file_to_compile
+            for file_to_compile in files_to_compile
+            if all(
+                exclude_dir not in file_to_compile.path
+                for exclude_dir in exclude_dirs
+            )
+        ]
+
+    def _compile_sources(self, resources, inc_dirs=None, exclude_dirs=None):
         # Web IDE progress bar for project build
         files_to_compile = (
             resources.get_file_refs(FileType.ASM_SRC) +
             resources.get_file_refs(FileType.C_SRC) +
             resources.get_file_refs(FileType.CPP_SRC)
         )
-        # Remove files from paths to be excluded from the build and create
-        # a compilation queue.
-        compile_queue = (
+        compilation_queue = (
             files_to_compile
-            if not exclude_paths
-            else [
-                file_to_compile
-                for exclude_path in exclude_paths
-                for file_to_compile in files_to_compile
-                if exclude_path not in file_to_compile.path
-            ]
+            if not exclude_dirs
+            else self._exclude_files_from_build(files_to_compile, exclude_dirs)
         )
-
-        self.to_be_compiled = len(compile_queue)
+        self.to_be_compiled = len(compilation_queue)
         self.compiled = 0
 
         self.notify.cc_verbose("Macros: " + ' '.join([
@@ -447,8 +466,8 @@ def compile_sources(self, resources, inc_dirs=None, exclude_paths=None):
         self.dump_build_profile()
 
         # Sort compile queue for consistency
-        compile_queue.sort()
-        for source in compile_queue:
+        compilation_queue.sort()
+        for source in compilation_queue:
             object = self.relative_object_path(self.build_dir, source)
 
             # Queue mode (multiprocessing)