Merge remote-tracking branch 'origin/improve_build_nr_lte_merge' into develop_integration_2020_w04

executables/nr-gnb.c

@@ -80,14 +80,9 @@
   #include "UTIL/OTG/otg_extern.h"
 #endif
 
-#if defined(ENABLE_ITTI)
-  #if defined(ENABLE_USE_MME)
-    #include "s1ap_eNB.h"
-    #ifdef PDCP_USE_NETLINK
-      #include "SIMULATION/ETH_TRANSPORT/proto.h"
-    #endif
-  #endif
-#endif
+#include "s1ap_eNB.h"
+#include "SIMULATION/ETH_TRANSPORT/proto.h"
+
 
 #include "T.h"
 

executables/nr-ru.c

@@ -104,14 +104,10 @@ static int DEFBFW[] = {0x00007fff};
   #include "UTIL/OTG/otg_extern.h"
 #endif
 
-#if defined(ENABLE_ITTI)
-  #if defined(ENABLE_USE_MME)
-    #include "s1ap_eNB.h"
-    #ifdef PDCP_USE_NETLINK
-      #include "SIMULATION/ETH_TRANSPORT/proto.h"
-    #endif
-  #endif
-#endif
+#include "s1ap_eNB.h"
+#include "SIMULATION/ETH_TRANSPORT/proto.h"
+
+
 
 #include "T.h"
 #include "nfapi_interface.h"

executables/nr-softmodem.c

@@ -428,7 +428,7 @@ int create_gNB_tasks(uint32_t gnb_nb) {
   }
 
   /*
-  #   if defined(ENABLE_USE_MME)
+    if (EPC_MODE_ENABLED) {
         if (gnb_nb > 0) {
           if (itti_create_task (TASK_SCTP, sctp_eNB_task, NULL) < 0) {
             LOG_E(SCTP, "Create task for SCTP failed\n");
@@ -452,7 +452,7 @@ int create_gNB_tasks(uint32_t gnb_nb) {
           }
         }
 
-  #      endif
+    }
   */
 
   if (gnb_nb > 0) {

executables/nr-ue.c

@@ -18,7 +18,7 @@
  * For more information about the OpenAirInterface (OAI) Software Alliance:
  *      contact@openairinterface.org
  */
-
+#include "executables/thread-common.h"
 #include "executables/nr-uesoftmodem.h"
 
 #include "LAYER2/NR_MAC_UE/mac.h"