Fix CI for branch feature-public-headers (#11093)

* Fix rtos include path in NRFCordioHCIDriver
* Flatten USB driver directory structure
* Add missing include for us_ticker
* Add more missing includes for us_ticker
* Fix mbed_hal_fpga_ci_test_shield/uart test
* Fix bare-metal build
* Fix Watchdog UNITTEST
* Fix Mbed OS 2 build for Public/Internal headers relocating

TESTS/mbed_hal/qspi/main.cpp

@@ -26,6 +26,7 @@
 
 #include "mbed.h"
 #include "qspi_api.h"
+#include "hal/us_ticker_api.h"
 
 
 #if !defined(QSPI_FLASH_CHIP_STRING)

TESTS/mbed_hal/qspi/qspi_test_utils.cpp

@@ -17,6 +17,7 @@
 #include "utest/utest.h"
 
 #include "hal/qspi_api.h"
+#include "hal/us_ticker_api.h"
 #include "qspi_test_utils.h"
 
 #include "unity/unity.h"

TESTS/mbed_hal/sleep/main.cpp

@@ -24,6 +24,7 @@
 #include "unity/unity.h"
 #include "greentea-client/test_env.h"
 #include "mbed_lp_ticker_wrapper.h"
+#include "hal/us_ticker_api.h"
 
 #include "sleep_test_utils.h"
 #include "sleep_api_tests.h"

TESTS/mbed_hal/sleep_manager/main.cpp

@@ -19,6 +19,7 @@
 #include <limits.h>
 #include "mbed.h"
 #include "mbed_lp_ticker_wrapper.h"
+#include "hal/us_ticker_api.h"
 #include "../sleep/sleep_test_utils.h"
 #include "sleep_manager_api_tests.h"
 

TESTS/mbed_hal_fpga_ci_test_shield/uart/main.cpp

@@ -27,6 +27,8 @@
 #include "unity/unity.h"
 #include "greentea-client/test_env.h"
 
+#include "platform/mbed_critical.h"
+
 using namespace utest::v1;
 
 #include <stdlib.h>

UNITTESTS/drivers/Watchdog/unittest.cmake

@@ -12,7 +12,7 @@ set(unittest-includes ${unittest-includes}
 
 # Source files
 set(unittest-sources
-  ../drivers/Watchdog.cpp
+  ../drivers/source/Watchdog.cpp
 )
 
 # Test files

drivers/source/usb/mbed_lib.json

@@ -0,0 +1,3 @@
+{
+    "name": "usb"
+}

features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCIDriver.cpp

@@ -21,7 +21,7 @@
 
 // mbed Includes
 #include "mbed_assert.h"
-#include "rtos/rtos_idle.h"
+#include "rtos/source/rtos_idle.h"
 #include "platform/mbed_power_mgmt.h"
 #include "mbed_critical.h"
 
@@ -368,7 +368,7 @@ bool NRFCordioHCIDriver::get_random_static_address(ble::address_t& address)
     return true;
 }
 
-ble::vendor::cordio::CordioHCIDriver& ble_cordio_get_hci_driver() { 
+ble::vendor::cordio::CordioHCIDriver& ble_cordio_get_hci_driver() {
     static NRFCordioHCITransportDriver transport_driver;
 
     static NRFCordioHCIDriver hci_driver(

tools/build_api.py

@@ -1068,10 +1068,16 @@ def build_mbed_libs(target, toolchain_name, clean=False, macros=None,
 
         incdirs = cmsis_res.inc_dirs + hal_res.inc_dirs + library_incdirs
 
+        # Exclude USB related source files from Mbed OS 2 build as they contain
+        # references to RTOS API which is also not included.
+        exclude_paths = [join(MBED_DRIVERS, "source", "usb")]
+
         # Build Things
         notify.info("Building library %s (%s, %s)" %
                     ('MBED', target.name, toolchain_name))
-        objects = toolchain.compile_sources(mbed_resources, incdirs)
+        objects = toolchain.compile_sources(
+            mbed_resources, incdirs, exclude_paths
+        )
         separate_objects = []
 
         for obj in objects:

tools/toolchains/mbed_toolchain.py

@@ -397,14 +397,27 @@ class mbedToolchain:
 
     # 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):
+    def compile_sources(self, resources, inc_dirs=None, exclude_paths=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)
         )
-        self.to_be_compiled = len(files_to_compile)
+        # Remove files from paths to be excluded from the build and create
+        # a compilation queue.
+        compile_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
+            ]
+        )
+
+        self.to_be_compiled = len(compile_queue)
         self.compiled = 0
 
         self.notify.cc_verbose("Macros: " + ' '.join([
@@ -434,8 +447,8 @@ class mbedToolchain:
         self.dump_build_profile()
 
         # Sort compile queue for consistency
-        files_to_compile.sort()
-        for source in files_to_compile:
+        compile_queue.sort()
+        for source in compile_queue:
             object = self.relative_object_path(self.build_dir, source)
 
             # Queue mode (multiprocessing)