Commit 7798be8f authored by Raphael Defosseux's avatar Raphael Defosseux

Merge remote-tracking branch 'origin/new_rlc_2020' into develop_integration_2020_w17

parents 681427fb 509e50ae
...@@ -1702,7 +1702,6 @@ set(L2_SRC ...@@ -1702,7 +1702,6 @@ set(L2_SRC
${PDCP_DIR}/pdcp_util.c ${PDCP_DIR}/pdcp_util.c
${PDCP_DIR}/pdcp_security.c ${PDCP_DIR}/pdcp_security.c
${PDCP_DIR}/pdcp_netlink.c ${PDCP_DIR}/pdcp_netlink.c
${RLC_V2}
# ${RRC_DIR}/rrc_UE.c # ${RRC_DIR}/rrc_UE.c
${RRC_DIR}/rrc_eNB.c ${RRC_DIR}/rrc_eNB.c
${RRC_DIR}/rrc_eNB_endc.c ${RRC_DIR}/rrc_eNB_endc.c
...@@ -1716,7 +1715,7 @@ set(L2_SRC ...@@ -1716,7 +1715,7 @@ set(L2_SRC
) )
set(L2_LTE_SRC set(L2_LTE_SRC
${RLC_V1} ${RLC_V2}
) )
set(L2_NR_SRC set(L2_NR_SRC
...@@ -1739,7 +1738,6 @@ set(L2_SRC_UE ...@@ -1739,7 +1738,6 @@ set(L2_SRC_UE
${PDCP_DIR}/pdcp_util.c ${PDCP_DIR}/pdcp_util.c
${PDCP_DIR}/pdcp_security.c ${PDCP_DIR}/pdcp_security.c
${PDCP_DIR}/pdcp_netlink.c ${PDCP_DIR}/pdcp_netlink.c
${RLC_V2}
${RRC_DIR}/rrc_UE.c ${RRC_DIR}/rrc_UE.c
${RRC_DIR}/rrc_common.c ${RRC_DIR}/rrc_common.c
${RRC_DIR}/L2_interface_common.c ${RRC_DIR}/L2_interface_common.c
...@@ -1754,7 +1752,7 @@ set(LTE_NR_L2_SRC_UE ...@@ -1754,7 +1752,7 @@ set(LTE_NR_L2_SRC_UE
${PDCP_DIR}/pdcp_util.c ${PDCP_DIR}/pdcp_util.c
${PDCP_DIR}/pdcp_security.c ${PDCP_DIR}/pdcp_security.c
${PDCP_DIR}/pdcp_netlink.c ${PDCP_DIR}/pdcp_netlink.c
${RLC_V1} ${RLC_V2}
) )
set(NR_L2_SRC_UE set(NR_L2_SRC_UE
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment