openharmony/communication_dsoftbus
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_dsoftbus synced 2024-11-27 02:40:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dsoftbus path modify

Browse Source 
Signed-off-by: wanghongtao <wanghongtao22@huawei.com>
This commit is contained in:
wanghongtao 2023-10-13 16:28:42 +08:00
parent 2ee4292035
commit 27da02a70c
58 changed files with 123 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adapter/common/bus_center/bus_center_adapter.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../dsoftbus.gni")
adapter_bus_center_path = "$softbus_adapter_common/bus_center"

2
adapter/common/net/bluetooth/net_bluetooth.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../dsoftbus.gni")
adapter_ble_inc = [
"$dsoftbus_root_path/adapter/common/include",

2
adapter/common/net/hdi/net_hdi.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../dsoftbus.gni")
softbus_adapter_hdi_path = "$softbus_adapter_common/net/hdi"

2
adapter/common/net/wifi/net_wifi.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../dsoftbus.gni")
softbus_adapter_wifi_path = "$softbus_adapter_common/net/wifi"

5
core/adapter/core_adapter.gni
View File

@ -10,9 +10,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import(
"//foundation/communication/dsoftbus/adapter/common/net/bluetooth/net_bluetooth.gni")
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../adapter/common/net/bluetooth/net_bluetooth.gni")
import("../../dsoftbus.gni")
br_adapter_src =
[ "$dsoftbus_root_path/core/adapter/br/mock/wrapper_br_interface.c" ]

2
core/authentication/authentication.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../dsoftbus.gni")
AUTH_SERVER_DEFINES = []
if (dsoftbus_feature_auth_account == true) {
AUTH_SERVER_DEFINES += [ "AUTH_ACCOUNT" ]

43
core/bus_center/bus_center_server.gni
View File

@ -11,28 +11,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import(
"//foundation/communication/dsoftbus/adapter/common/bus_center/bus_center_adapter.gni")
import("//foundation/communication/dsoftbus/adapter/common/net/hdi/net_hdi.gni")
import(
"//foundation/communication/dsoftbus/adapter/common/net/wifi/net_wifi.gni")
import("//foundation/communication/dsoftbus/core/adapter/core_adapter.gni")
import(
"//foundation/communication/dsoftbus/core/bus_center/lnn/decision_center/decision_center.gni")
import(
"//foundation/communication/dsoftbus/core/bus_center/lnn/disc_mgr/bus_center_disc_mgr.gni")
import(
"//foundation/communication/dsoftbus/core/bus_center/lnn/lane_hub/lane_hub.gni")
import(
"//foundation/communication/dsoftbus/core/bus_center/lnn/net_builder/net_builder.gni")
import(
"//foundation/communication/dsoftbus/core/bus_center/lnn/net_buscenter/net_manager.gni")
import(
"//foundation/communication/dsoftbus/core/bus_center/lnn/net_ledger/net_ledger.gni")
import(
"//foundation/communication/dsoftbus/core/bus_center/monitor/bus_center_monitor.gni")
import(
"//foundation/communication/dsoftbus/core/bus_center/utils/bus_center_utils.gni")
import("../../adapter/common/bus_center/bus_center_adapter.gni")
import("../../adapter/common/net/hdi/net_hdi.gni")
import("../../adapter/common/net/wifi/net_wifi.gni")
import("../../core/adapter/core_adapter.gni")
import("../../core/bus_center/lnn/decision_center/decision_center.gni")
import("../../core/bus_center/lnn/disc_mgr/bus_center_disc_mgr.gni")
import("../../core/bus_center/lnn/lane_hub/lane_hub.gni")
import("../../core/bus_center/lnn/net_builder/net_builder.gni")
import("../../core/bus_center/lnn/net_buscenter/net_manager.gni")
import("../../core/bus_center/lnn/net_ledger/net_ledger.gni")
import("../../core/bus_center/monitor/bus_center_monitor.gni")
import("../../core/bus_center/utils/bus_center_utils.gni")
bus_center_server_src =
bus_center_adapter_src + bus_center_core_adapter_src +
@ -122,8 +112,7 @@ agcr_enhanced = exec_script("$dsoftbus_root_path/check_sub_module.py",
"value")
if (agcr_enhanced) {
import(
"//foundation/communication/dsoftbus/dsoftbus_enhance/components/newip/agcr/agcr.gni")
import("../../dsoftbus_enhance/components/newip/agcr/agcr.gni")
bus_center_server_src += agcr_src
bus_center_server_inc += agcr_inc
@ -138,8 +127,7 @@ route_enhanced = exec_script("$dsoftbus_root_path/check_sub_module.py",
"value")
if (route_enhanced) {
import(
"//foundation/communication/dsoftbus/dsoftbus_enhance/components/newip/route/route.gni")
import("../../dsoftbus_enhance/components/newip/route/route.gni")
bus_center_server_src += route_src
bus_center_server_inc += route_inc
@ -154,8 +142,7 @@ btn_enhanced = exec_script("$dsoftbus_root_path/check_sub_module.py",
"value")
if (btn_enhanced) {
import(
"//foundation/communication/dsoftbus/dsoftbus_enhance/components/newip/btn/btn.gni")
import("../../dsoftbus_enhance/components/newip/btn/btn.gni")
bus_center_server_src += btn_src
bus_center_server_inc += btn_inc

2
core/bus_center/lnn/decision_center/decision_center.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../dsoftbus.gni")
native_source_path = rebase_path("$dsoftbus_root_path")
dicision_center_enhance_path =

2
core/bus_center/lnn/disc_mgr/bus_center_disc_mgr.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../dsoftbus.gni")
bus_center_disc_mgr_src = [ "$dsoftbus_root_path/core/bus_center/lnn/disc_mgr/src/lnn_discovery_interface.c" ]

2
core/bus_center/lnn/lane_hub/lane_hub.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../dsoftbus.gni")
core_lane_hub_path = "$dsoftbus_root_path/core/bus_center/lnn/lane_hub"

2
core/bus_center/lnn/net_builder/net_builder.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../dsoftbus.gni")
native_source_path = rebase_path("$dsoftbus_root_path")
lnn_dep_dir = "dsoftbus_enhance/core/bus_center/lnn/net_builder"

5
core/bus_center/lnn/net_buscenter/net_manager.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../dsoftbus.gni")
if (dsoftbus_feature_lnn_net) {
bus_center_net_mgr_src = [
@ -42,8 +42,7 @@ newip_enhanced = exec_script("$dsoftbus_root_path/check_sub_module.py",
"value")
if (newip_enhanced) {
import(
"//foundation/communication/dsoftbus/dsoftbus_enhance/components/newip/network/network.gni")
import("../../../../dsoftbus_enhance/components/newip/network/network.gni")
bus_center_net_mgr_src += newip_manager_src
bus_center_net_mgr_inc += newip_manager_include

2
core/bus_center/lnn/net_ledger/net_ledger.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../dsoftbus.gni")
bus_center_ledger_src = [
"$dsoftbus_root_path/core/bus_center/lnn/net_ledger/common/src/lnn_device_info.c",

2
core/bus_center/monitor/bus_center_monitor.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../dsoftbus.gni")
if (dsoftbus_feature_lnn_net) {
bus_center_monitor_src =

2
core/bus_center/utils/bus_center_utils.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../dsoftbus.gni")
core_bus_center_utils_path = "$dsoftbus_root_path/core/bus_center/utils"

2
core/common/security/permission/permission.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../dsoftbus.gni")
softbus_permission_external_deps = []

5
core/connection/ble/conn_ble.gni
View File

@ -11,9 +11,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import(
"//foundation/communication/dsoftbus/adapter/common/net/bluetooth/net_bluetooth.gni")
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../adapter/common/net/bluetooth/net_bluetooth.gni")
import("../../../dsoftbus.gni")
native_source_path = rebase_path("$dsoftbus_root_path")
conn_ble_dir = "dsoftbus_enhance/core/connection/ble/src"

4
core/connection/br/conn_br.gni
View File

@ -11,8 +11,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/core/adapter/core_adapter.gni")
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../core/adapter/core_adapter.gni")
import("../../../dsoftbus.gni")
br_connection_inc = br_adapter_inc
if (!support_bluetooth) {

5
core/connection/common/conn_common.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../dsoftbus.gni")
conn_common_src = [
"$dsoftbus_root_path/core/connection/common/src/softbus_base_listener.c",
"$dsoftbus_root_path/core/connection/common/src/softbus_conn_common.c",
@ -36,8 +36,7 @@ newip_enhanced = exec_script("$dsoftbus_root_path/check_sub_module.py",
"value")
if (newip_enhanced) {
import(
"//foundation/communication/dsoftbus/dsoftbus_enhance/components/newip/network/network.gni")
import("../../../dsoftbus_enhance/components/newip/network/network.gni")
conn_common_src += newip_connection_src
conn_common_inc += newip_connection_include

11
core/connection/conn.gni
View File

@ -11,14 +11,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/core/connection/ble/conn_ble.gni")
import("//foundation/communication/dsoftbus/core/connection/br/conn_br.gni")
import(
"//foundation/communication/dsoftbus/core/connection/wifi_direct/wifi_direct.gni")
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../core/connection/ble/conn_ble.gni")
import("../../core/connection/br/conn_br.gni")
import("../../core/connection/wifi_direct/wifi_direct.gni")
import("../../dsoftbus.gni")
#import("//foundation/communication/dsoftbus/core/connection/common/conn_common.gni")
import("//foundation/communication/dsoftbus/core/connection/tcp/conn_tcp.gni")
import("../../core/connection/tcp/conn_tcp.gni")
conn_manager_src = ble_connection_src + br_connection_src + tcp_connection_src +
wifi_direct_connection_src
conn_manager_inc = ble_connection_inc + br_connection_inc + tcp_connection_inc +

2
core/connection/p2p/conn_p2p.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../dsoftbus.gni")
p2p_connection_src = []
p2p_connection_external_deps = []

2
core/connection/tcp/conn_tcp.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../dsoftbus.gni")
if (dsoftbus_feature_conn_tcp == true) {
tcp_connection_src = [

4
core/connection/wifi_direct/wifi_direct.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../dsoftbus.gni")
native_source_path = rebase_path("$dsoftbus_root_path")
wifi_direct_enhance_dir = "dsoftbus_enhance/core/connection/wifi_direct"
@ -89,7 +89,7 @@ if (dsoftbus_feature_conn_p2p == true &&
if (enhanced_wifi_direct) {
import(
"//foundation/communication/dsoftbus/dsoftbus_enhance/core/connection/wifi_direct/wifi_direct.gni")
"../../../dsoftbus_enhance/core/connection/wifi_direct/wifi_direct.gni")
wifi_direct_connection_inc += wifi_direct_connection_enhance_inc
wifi_direct_connection_src += wifi_direct_connection_enhance_src

2
core/discovery/ble/disc_ble.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../dsoftbus.gni")
native_source_path = rebase_path("$dsoftbus_root_path")
disc_dep_dir = "dsoftbus_enhance/core/discovery/ble/share_ble"

2
core/discovery/coap/disc_coap.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../dsoftbus.gni")
if (dsoftbus_feature_disc_coap == true) {
disc_coap_src = [

6
core/discovery/disc.gni
View File

@ -11,9 +11,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/core/discovery/ble/disc_ble.gni")
import("//foundation/communication/dsoftbus/core/discovery/coap/disc_coap.gni")
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../core/discovery/ble/disc_ble.gni")
import("../../core/discovery/coap/disc_coap.gni")
import("../../dsoftbus.gni")
disc_server_src = ble_discovery_src + disc_coap_src
disc_server_inc = ble_discovery_inc + disc_coap_inc

2
core/transmission/common/trans_common.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../dsoftbus.gni")
trans_common_inc = [
"$dsoftbus_root_path/core/transmission/common/include",
"$dsoftbus_root_path/interfaces/kits/transport",

5
core/transmission/trans.gni
View File

@ -11,9 +11,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import(
"//foundation/communication/dsoftbus/core/transmission/trans_channel/trans_channel.gni")
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../core/transmission/trans_channel/trans_channel.gni")
import("../../dsoftbus.gni")
native_source_path = rebase_path("$dsoftbus_root_path")
broadcast_dep_dir =

2
core/transmission/trans_channel/common/common.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../dsoftbus.gni")
dsoftbus_trans_channel_common_path =
"$dsoftbus_root_path/core/transmission/trans_channel/common"

2
core/transmission/trans_channel/proxy/proxy.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../dsoftbus.gni")
dsoftbus_trans_proxy_channel_path =
"$dsoftbus_root_path/core/transmission/trans_channel/proxy"

2
core/transmission/trans_channel/qos/qos.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../dsoftbus.gni")
trans_qos_src = []
trans_qos_inc =

2
core/transmission/trans_channel/tcp_direct/tcp_direct.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../dsoftbus.gni")
tcp_direct_channel_path =
"$dsoftbus_root_path/core/transmission/trans_channel/tcp_direct"
trans_direct_channel_src = [

16
core/transmission/trans_channel/trans_channel.gni
View File

@ -11,17 +11,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("../../../core/transmission/trans_channel/common/common.gni")
import("../../../core/transmission/trans_channel/proxy/proxy.gni")
import("../../../core/transmission/trans_channel/qos/qos.gni")
import("../../../core/transmission/trans_channel/tcp_direct/tcp_direct.gni")
import(
"//foundation/communication/dsoftbus/core/transmission/trans_channel/common/common.gni")
import(
"//foundation/communication/dsoftbus/core/transmission/trans_channel/proxy/proxy.gni")
import(
"//foundation/communication/dsoftbus/core/transmission/trans_channel/qos/qos.gni")
import(
"//foundation/communication/dsoftbus/core/transmission/trans_channel/tcp_direct/tcp_direct.gni")
import(
"//foundation/communication/dsoftbus/core/transmission/trans_channel/udp_negotiation/udp_negotiation.gni")
import("//foundation/communication/dsoftbus/dsoftbus.gni")
"../../../core/transmission/trans_channel/udp_negotiation/udp_negotiation.gni")
import("../../../dsoftbus.gni")
trans_channel_src =
trans_channel_common_src + trans_proxy_channel_src +

2
core/transmission/trans_channel/udp_negotiation/udp_negotiation.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../dsoftbus.gni")
udp_channel_path =
"$dsoftbus_root_path/core/transmission/trans_channel/udp_negotiation"

2
core/transmission/trans_channel/udp_negotiation_socket/udp_negotiation.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../dsoftbus.gni")
udp_channel_path =
"$dsoftbus_root_path/core/transmission/trans_channel/udp_negotiation"

5
core/transmission_socket/trans.gni
View File

@ -11,9 +11,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import(
"//foundation/communication/dsoftbus/core/transmission/trans_channel/trans_channel.gni")
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../core/transmission/trans_channel/trans_channel.gni")
import("../../dsoftbus.gni")
native_source_path = rebase_path("$dsoftbus_root_path")
broadcast_dep_dir =

2
core/transmission_socket/trans_channel/common/common.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../dsoftbus.gni")
dsoftbus_trans_channel_common_path =
"$dsoftbus_root_path/core/transmission/trans_channel/common"

2
dsoftbus.gni
View File

@ -12,7 +12,7 @@
# limitations under the License.
hispark_pegasus_sdk_path = "//device/soc/hisilicon/hi3861v100/sdk_liteos"
dsoftbus_root_path = "//foundation/communication/dsoftbus"
dsoftbus_root_path = rebase_path(".")
dsoftbus_sdk_path = "${dsoftbus_root_path}/sdk"
dsoftbus_core_path = "${dsoftbus_root_path}/core"
dsoftbus_test_path = "${dsoftbus_root_path}/tests"

5
sdk/BUILD.gn
View File

@ -64,6 +64,11 @@ config("dsoftbus_sdk_interface") {
"$dsoftbus_root_path/interfaces/inner_kits/transport",
"$dsoftbus_root_path/core/common/dfx/hisysevent_adapter/include",
]
if (enhanced_kits_broadcast) {
include_dirs +=
[ "$dsoftbus_root_path/dsoftbus_enhance/interfaces/kits/broadcast" ]
}
}
target(build_type, "softbus_client") {

2
sdk/bus_center/bus_center_sdk.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../dsoftbus.gni")
bus_center_service_sdk_src =
[ "$dsoftbus_root_path/sdk/bus_center/service/src/client_bus_center.c" ]

4
sdk/discovery/disc_sdk.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../dsoftbus.gni")
disc_sdk_src =
[ "$dsoftbus_root_path/sdk/discovery/service/src/client_disc_service.c" ]
@ -23,7 +23,7 @@ disc_sdk_inc = [
if (defined(ohos_lite)) {
disc_sdk_inc += [ "$dsoftbus_root_path/core/discovery/interface" ]
if (ohos_kernel_type == "liteos_m") {
import("//foundation/communication/dsoftbus/core/discovery/disc.gni")
import("../../core/discovery/disc.gni")
disc_sdk_src += [
"$dsoftbus_root_path/sdk/discovery/ipc/mini/disc_server_proxy.c",
"$dsoftbus_root_path/sdk/discovery/manager/src/client_disc_manager.c",

2
sdk/frame/frame_sdk.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../dsoftbus.gni")
softbus_client_frame_inc = []
if (defined(ohos_lite)) {
if (ohos_kernel_type == "liteos_m") {

2
sdk/transmission/ipc/trans_ipc_sdk.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../dsoftbus.gni")
trans_ipc_proxy_sdk_inc = [ "$dsoftbus_root_path/sdk/transmission/ipc/include" ]
if (defined(ohos_lite)) {

12
sdk/transmission/session/trans_session_sdk.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../dsoftbus.gni")
native_source_path = rebase_path("$dsoftbus_root_path")
trans_session_sdk_src = [
@ -20,6 +20,14 @@ trans_session_sdk_src = [
"$dsoftbus_sdk_path/transmission/session/src/client_trans_message_service.c",
"$dsoftbus_sdk_path/transmission/session/src/client_trans_session_service.c",
]
broadcast_dep_dir = "dsoftbus_enhance/interfaces/kits/broadcast"
enhanced_kits_broadcast = exec_script("$dsoftbus_root_path/check_sub_module.py",
[
"$native_source_path",
"$broadcast_dep_dir",
],
"value")
if (defined(ohos_lite)) {
trans_session_sdk_inc = [
"$dsoftbus_sdk_path/transmission/session/include",
@ -74,7 +82,7 @@ schema_enhanced = exec_script("$dsoftbus_root_path/check_sub_module.py",
if (schema_enhanced) {
import(
"//foundation/communication/dsoftbus/dsoftbus_enhance/sdk/transmission/session/src/trans_schema.gni")
"../../../dsoftbus_enhance/sdk/transmission/session/src/trans_schema.gni")
trans_session_sdk_src += schema_src
trans_session_sdk_inc += schema_inc

2
sdk/transmission/trans_channel/auth/trans_auth_sdk.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../dsoftbus.gni")
trans_auth_channel_sdk_src = [ "$dsoftbus_sdk_path/transmission/trans_channel/auth/src/client_trans_auth_manager.c" ]
trans_auth_channel_sdk_inc =

2
sdk/transmission/trans_channel/proxy/trans_proxy_sdk.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../dsoftbus.gni")
trans_proxy_channel_sdk_src = [
"$dsoftbus_sdk_path/transmission/trans_channel/proxy/src/client_trans_proxy_manager.c",

2
sdk/transmission/trans_channel/qos/trans_qos_sdk.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../dsoftbus.gni")
trans_qos_sdk_src = [
"$dsoftbus_sdk_path/transmission/trans_channel/qos/src/client_qos_manager.c",

2
sdk/transmission/trans_channel/tcp_direct/trans_tcp_sdk.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../dsoftbus.gni")
trans_direct_channel_sdk_src = [
"$dsoftbus_sdk_path/transmission/trans_channel/tcp_direct/src/client_trans_tcp_direct_callback.c",

17
sdk/transmission/trans_channel/trans_channel_sdk.gni
View File

@ -11,17 +11,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import(
"//foundation/communication/dsoftbus/sdk/transmission/trans_channel/auth/trans_auth_sdk.gni")
import(
"//foundation/communication/dsoftbus/sdk/transmission/trans_channel/proxy/trans_proxy_sdk.gni")
import(
"//foundation/communication/dsoftbus/sdk/transmission/trans_channel/qos/trans_qos_sdk.gni")
import(
"//foundation/communication/dsoftbus/sdk/transmission/trans_channel/tcp_direct/trans_tcp_sdk.gni")
import(
"//foundation/communication/dsoftbus/sdk/transmission/trans_channel/udp/trans_udp_sdk.gni")
import("../../../dsoftbus.gni")
import("../../../sdk/transmission/trans_channel/auth/trans_auth_sdk.gni")
import("../../../sdk/transmission/trans_channel/proxy/trans_proxy_sdk.gni")
import("../../../sdk/transmission/trans_channel/qos/trans_qos_sdk.gni")
import("../../../sdk/transmission/trans_channel/tcp_direct/trans_tcp_sdk.gni")
import("../../../sdk/transmission/trans_channel/udp/trans_udp_sdk.gni")
trans_channel_sdk_inc =
trans_auth_channel_sdk_inc + trans_proxy_channel_sdk_inc +

2
sdk/transmission/trans_channel/udp/file/file_sdk.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../../dsoftbus.gni")
dsoftbus_file_sdk_path =
"$dsoftbus_root_path/sdk/transmission/trans_channel/udp/file"

2
sdk/transmission/trans_channel/udp/stream/libsoftbus_stream/libsoftbus_stream.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../../../dsoftbus.gni")
libsoftbus_stream_sdk_path = "$dsoftbus_root_path/sdk/transmission/trans_channel/udp/stream/libsoftbus_stream"
dstream_native_source_path = rebase_path("$dsoftbus_root_path")

5
sdk/transmission/trans_channel/udp/stream/stream_sdk.gni
View File

@ -11,9 +11,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
stream_sdk_path = rebase_path("../../../../../sdk")
import(
"$dsoftbus_sdk_path/transmission/trans_channel/udp/stream/libsoftbus_stream/libsoftbus_stream.gni")
"$stream_sdk_path/transmission/trans_channel/udp/stream/libsoftbus_stream/libsoftbus_stream.gni")
import("../../../../../dsoftbus.gni")
dsoftbus_stream_sdk_path =
"$dsoftbus_root_path/sdk/transmission/trans_channel/udp/stream"

8
sdk/transmission/trans_channel/udp/trans_udp_sdk.gni
View File

@ -11,10 +11,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("$dsoftbus_sdk_path/transmission/trans_channel/udp/file/file_sdk.gni")
import(
"$dsoftbus_sdk_path/transmission/trans_channel/udp/stream/stream_sdk.gni")
udp_sdk_path = rebase_path("../../../../sdk")
import("$udp_sdk_path/transmission/trans_channel/udp/file/file_sdk.gni")
import("$udp_sdk_path/transmission/trans_channel/udp/stream/stream_sdk.gni")
import("../../../../dsoftbus.gni")
dsoftbus_udp_sdk_path = "$dsoftbus_sdk_path/transmission/trans_channel/udp"
if (dsoftbus_feature_trans_udp == true) {

11
sdk/transmission/trans_sdk.gni
View File

@ -11,13 +11,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import(
"//foundation/communication/dsoftbus/sdk/transmission/ipc/trans_ipc_sdk.gni")
import(
"//foundation/communication/dsoftbus/sdk/transmission/session/trans_session_sdk.gni")
import(
"//foundation/communication/dsoftbus/sdk/transmission/trans_channel/trans_channel_sdk.gni")
import("../../dsoftbus.gni")
import("../../sdk/transmission/ipc/trans_ipc_sdk.gni")
import("../../sdk/transmission/session/trans_session_sdk.gni")
import("../../sdk/transmission/trans_channel/trans_channel_sdk.gni")
trans_session_manager_sdk_inc =
trans_ipc_proxy_sdk_inc + trans_session_sdk_inc + trans_channel_sdk_inc

2
tests/core/transmission/common/mock/mock.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../../../../dsoftbus.gni")
trans_comm_mock_path = "$dsoftbus_test_path/core/transmission/common/mock"
trans_comm_mock_src = [

10
tests/sdk/frame/fuzztest/softbusclientstub_fuzzer/BUILD.gn
View File

@ -15,12 +15,12 @@
import("//build/config/features.gni")
import("//build/ohos.gni")
import("//build/test.gni")
import("//foundation/communication/dsoftbus/sdk/bus_center/bus_center_sdk.gni")
import("//foundation/communication/dsoftbus/sdk/discovery/disc_sdk.gni")
import("//foundation/communication/dsoftbus/sdk/frame/frame_sdk.gni")
import("//foundation/communication/dsoftbus/sdk/frame/frame_sdk.gni")
import("//foundation/communication/dsoftbus/sdk/transmission/trans_sdk.gni")
import("../../../../../dsoftbus.gni")
import("../../../../../sdk/bus_center/bus_center_sdk.gni")
import("../../../../../sdk/discovery/disc_sdk.gni")
import("../../../../../sdk/frame/frame_sdk.gni")
import("../../../../../sdk/frame/frame_sdk.gni")
import("../../../../../sdk/transmission/trans_sdk.gni")
dsoftbus_root_path = "../../../../.."
common_client_src = bus_center_sdk_src + disc_sdk_src +

3
tests/sdk/transmission/fuzztest/vtpstreamsocket_fuzzer/BUILD.gn
View File

@ -20,7 +20,8 @@ import("../../../../../dsoftbus.gni")
##############################fuzztest##########################################
ohos_fuzztest("VtpStreamSocketFuzzTest") {
module_out_path = dsoftbus_fuzz_out_path
fuzz_config_file = "//foundation/communication/dsoftbus/tests/sdk/transmission/fuzztest/vtpstreamsocket_fuzzer"
fuzz_config_file =
"../../../../../tests/sdk/transmission/fuzztest/vtpstreamsocket_fuzzer"
include_dirs = [
"../../../../../core/common/inner_communication",
"../../../../../adapter/common/include",

2
tests/utils/utils.gni
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//foundation/communication/dsoftbus/dsoftbus.gni")
import("../../dsoftbus.gni")
test_utils_src =
[ "$dsoftbus_root_path/tests/utils/exception_branch_checker.cpp" ]