Merge remote-tracking branch 'origin/remove_targets_arch' into integration_2022_wk39

openair2/LAYER2/MAC/mac.h

@@ -74,7 +74,7 @@
 #include "PHY/defs_common.h" // for PRACH_RESOURCES_t
 #include "PHY/LTE_TRANSPORT/transport_common.h"
 
-#include "targets/ARCH/COMMON/common_lib.h"
+#include "sdr/COMMON/common_lib.h"
 
 /** @defgroup _mac  MAC
  * @ingroup _oai2

openair2/LAYER2/NR_MAC_UE/main_ue_nr.c

@@ -32,7 +32,7 @@
 
 //#include "defs.h"
 #include "mac_proto.h"
-#include "../../ARCH/COMMON/common_lib.h"
+#include "sdr/COMMON/common_lib.h"
 //#undef MALLOC
 #include "assertions.h"
 #include "PHY/types.h"

openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

@@ -43,7 +43,7 @@
 #include <string.h>
 
 /* Commmon */
-#include "targets/ARCH/COMMON/common_lib.h"
+#include "sdr/COMMON/common_lib.h"
 #include "COMMON/platform_constants.h"
 #include "common/ran_context.h"
 #include "collection/linear_alloc.h"