From 5afff48d7d0365cefa5ae007e47eb0256949efc6 Mon Sep 17 00:00:00 2001 From: hwwuhaobo Date: Wed, 3 May 2023 17:21:12 +0800 Subject: [PATCH 1/2] modify build flag Signed-off-by: hwwuhaobo --- services/audioclient/test/unittest/spkclient/BUILD.gn | 1 - services/audiomanager/managersink/include/daudio_sink_dev.h | 2 +- services/audiomanager/managersink/src/daudio_sink_dev.cpp | 4 ++-- services/softbusadapter/BUILD.gn | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/services/audioclient/test/unittest/spkclient/BUILD.gn b/services/audioclient/test/unittest/spkclient/BUILD.gn index c758d705..db812ce5 100644 --- a/services/audioclient/test/unittest/spkclient/BUILD.gn +++ b/services/audioclient/test/unittest/spkclient/BUILD.gn @@ -22,7 +22,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//foundation/multimedia/audio_framework/frameworks/native/audiopolicy/include", "${mediastandardfwk_path}/audiocommon/include", "${mediastandardfwk_path}/audiomanager/include", "${mediastandardfwk_path}/audiorenderer/include", diff --git a/services/audiomanager/managersink/include/daudio_sink_dev.h b/services/audiomanager/managersink/include/daudio_sink_dev.h index 8e5d07ef..1a87a97a 100644 --- a/services/audiomanager/managersink/include/daudio_sink_dev.h +++ b/services/audiomanager/managersink/include/daudio_sink_dev.h @@ -29,7 +29,7 @@ #include "imic_client.h" #include "ispk_client.h" #include "iaudio_event_callback.h" -#ifdef DDAUDIO_SUPPORT_DIRECT +#ifdef DAUDIO_SUPPORT_DIRECT #include "direct_dmic_client.h" #include "direct_dspeaker_client.h" #endif diff --git a/services/audiomanager/managersink/src/daudio_sink_dev.cpp b/services/audiomanager/managersink/src/daudio_sink_dev.cpp index 566e508b..f6f2b135 100644 --- a/services/audiomanager/managersink/src/daudio_sink_dev.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_dev.cpp @@ -394,7 +394,7 @@ int32_t DAudioSinkDev::TaskOpenDSpeaker(const std::string &args) if (speakerClient_ == nullptr) { speakerClient_ = std::make_shared(devId_, shared_from_this()); } -#ifdef DDAUDIO_SUPPORT_DIRECT +#ifdef DAUDIO_SUPPORT_DIRECT if (audioParam.renderOpts.renderFlags == MMAP_MODE) { DHLOGI("Try to mmap mode."); speakerClient_ = std::shared_ptr(); @@ -464,7 +464,7 @@ int32_t DAudioSinkDev::TaskOpenDMic(const std::string &args) if (micClient_ == nullptr) { micClient_ = std::make_shared(devId_, shared_from_this()); } -#ifdef DDAUDIO_SUPPORT_DIRECT +#ifdef DAUDIO_SUPPORT_DIRECT if (audioParam.captureOpts.capturerFlags == MMAP_MODE) { DHLOGI("Try to mmap mode."); micClient_ = std::make_shared(); diff --git a/services/softbusadapter/BUILD.gn b/services/softbusadapter/BUILD.gn index eb042afa..d460346c 100644 --- a/services/softbusadapter/BUILD.gn +++ b/services/softbusadapter/BUILD.gn @@ -17,7 +17,6 @@ import("../../distributedaudio.gni") ohos_shared_library("distributed_audio_softbus_adapter") { include_dirs = [ - "//foundation/communication/dsoftbus/interfaces/kits/common", "${fwk_common_path}/utils/include", "//third_party/json/include", ] -- Gitee From 3ef7bf54ba9cf5dfb8a78faa396b3e73803a3dbd Mon Sep 17 00:00:00 2001 From: hwwuhaobo Date: Thu, 4 May 2023 16:51:47 +0800 Subject: [PATCH 2/2] modify gn & fix sinkdev bug Signed-off-by: hwwuhaobo --- common/dfx_utils/test/unittest/BUILD.gn | 2 +- hdf_interfaces/distributed_audio/bundle.json | 4 +++- hdf_service/distributed_audio/bundle.json | 4 +++- services/audiomanager/managersink/src/daudio_sink_dev.cpp | 2 +- services/audiomanager/servicesink/BUILD.gn | 2 +- services/audiomanager/servicesource/BUILD.gn | 2 +- services/audiomanager/test/unittest/servicesink/BUILD.gn | 2 +- services/audiomanager/test/unittest/servicesource/BUILD.gn | 2 +- services/audiomanager/test/unittest/source_device/BUILD.gn | 3 +-- services/audiomanager/test/unittest/sourcemanager/BUILD.gn | 2 +- .../audiotransport/audiochannel/audiodatachannel/BUILD.gn | 2 +- services/audiotransport/audioctrltransport/BUILD.gn | 2 +- services/audiotransport/decodetransport/BUILD.gn | 2 +- .../audiotransport/test/unittest/audioctrlchannel/BUILD.gn | 1 - .../audiotransport/test/unittest/audioctrltransport/BUILD.gn | 2 -- .../audiotransport/test/unittest/audiodatachannel/BUILD.gn | 2 -- .../audiotransport/test/unittest/decodetransport/BUILD.gn | 3 ++- .../audiotransport/test/unittest/encodetransport/BUILD.gn | 3 ++- services/softbusadapter/test/unittest/BUILD.gn | 2 -- 19 files changed, 21 insertions(+), 23 deletions(-) diff --git a/common/dfx_utils/test/unittest/BUILD.gn b/common/dfx_utils/test/unittest/BUILD.gn index 8e328fa1..19bb0573 100644 --- a/common/dfx_utils/test/unittest/BUILD.gn +++ b/common/dfx_utils/test/unittest/BUILD.gn @@ -52,7 +52,6 @@ config("module_private_config") { "${services_path}/common/audioeventcallback", "${services_path}/audiomanager/managersource/include", "${softbusadapter_path}/include", - "//foundation/communication/dsoftbus/interfaces/kits/transport", "//third_party/json/include", "${fwk_common_path}/utils/include", "${mediastandardfwk_path}/audiocapturer/include", @@ -82,6 +81,7 @@ ohos_unittest("DAudioDfxTest") { external_deps = [ "audio_framework:audio_capturer", "c_utils:utils", + "dsoftbus:softbus_client", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "ipc:ipc_core", diff --git a/hdf_interfaces/distributed_audio/bundle.json b/hdf_interfaces/distributed_audio/bundle.json index 0b2891a4..3d0799d4 100644 --- a/hdf_interfaces/distributed_audio/bundle.json +++ b/hdf_interfaces/distributed_audio/bundle.json @@ -3,10 +3,12 @@ "description": "distributed audio device driver interface", "version": "4.0", "license": "Apache License 2.0", + "segment":{ + "destPath":"foundation/distributedhardware/distributed_audio/hdf_interfaces/" + }, "component": { "name": "drivers_interface_distributed_audio", "subsystem": "distributedhardware", - "syscap": [""], "adapted_system_type":[ "standard" ], diff --git a/hdf_service/distributed_audio/bundle.json b/hdf_service/distributed_audio/bundle.json index 605514fa..c01de7d0 100644 --- a/hdf_service/distributed_audio/bundle.json +++ b/hdf_service/distributed_audio/bundle.json @@ -3,10 +3,12 @@ "description": "distributed audo device driver", "version": "4.0", "license": "Apache License 2.0", + "segment":{ + "destPath":"foundation/distributedhardware/distributed_audio/hdf_service/" + }, "component": { "name": "drivers_peripheral_distributed_audio", "subsystem": "distributedhardware", - "syscap": [ "" ], "adapted_system_type":[ "standard" ], diff --git a/services/audiomanager/managersink/src/daudio_sink_dev.cpp b/services/audiomanager/managersink/src/daudio_sink_dev.cpp index f6f2b135..945c7e94 100644 --- a/services/audiomanager/managersink/src/daudio_sink_dev.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_dev.cpp @@ -397,7 +397,7 @@ int32_t DAudioSinkDev::TaskOpenDSpeaker(const std::string &args) #ifdef DAUDIO_SUPPORT_DIRECT if (audioParam.renderOpts.renderFlags == MMAP_MODE) { DHLOGI("Try to mmap mode."); - speakerClient_ = std::shared_ptr(); + speakerClient_ = std::make_shared(); speakerClient_->SetAttrs(devId_, shared_from_this()); } #endif diff --git a/services/audiomanager/servicesink/BUILD.gn b/services/audiomanager/servicesink/BUILD.gn index 912a3cd2..aa5a46f4 100755 --- a/services/audiomanager/servicesink/BUILD.gn +++ b/services/audiomanager/servicesink/BUILD.gn @@ -17,7 +17,6 @@ import("../../../distributedaudio.gni") ohos_shared_library("distributed_audio_sink") { include_dirs = [ - "//foundation/communication/dsoftbus/interfaces/kits/transport", "//third_party/json/include", "${fwk_common_path}/utils/include", ] @@ -92,6 +91,7 @@ ohos_shared_library("distributed_audio_sink") { "audio_framework:audio_client", "audio_framework:audio_renderer", "c_utils:utils", + "dsoftbus:softbus_client", "drivers_interface_audio:libaudio_proxy_1.0", "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdi", diff --git a/services/audiomanager/servicesource/BUILD.gn b/services/audiomanager/servicesource/BUILD.gn index ae7f7f08..90bdfebc 100755 --- a/services/audiomanager/servicesource/BUILD.gn +++ b/services/audiomanager/servicesource/BUILD.gn @@ -18,7 +18,6 @@ import("../../../distributedaudio.gni") ohos_shared_library("distributed_audio_source") { include_dirs = [ "//drivers/peripheral/audio/interfaces/include", - "//foundation/communication/dsoftbus/interfaces/kits/transport", "//third_party/json/include", "${fwk_common_path}/utils/include", "${mediastandardfwk_path}/audiocapturer/include", @@ -89,6 +88,7 @@ ohos_shared_library("distributed_audio_source") { external_deps = [ "c_utils:utils", + "dsoftbus:softbus_client", "hdf_core:libhdi", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", diff --git a/services/audiomanager/test/unittest/servicesink/BUILD.gn b/services/audiomanager/test/unittest/servicesink/BUILD.gn index 13771b46..3adbfa4c 100644 --- a/services/audiomanager/test/unittest/servicesink/BUILD.gn +++ b/services/audiomanager/test/unittest/servicesink/BUILD.gn @@ -23,7 +23,6 @@ config("module_private_config") { include_dirs = [ "${audio_framework_path}/audiopolicy/include", - "//foundation/communication/dsoftbus/interfaces/kits/transport", "//third_party/json/include", "${fwk_common_path}/utils/include", "${mediastandardfwk_path}/audiocapturer/include", @@ -83,6 +82,7 @@ ohos_unittest("DaudioSinkServiceTest") { "audio_framework:audio_client", "audio_framework:audio_renderer", "c_utils:utils", + "dsoftbus:softbus_client", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "ipc:ipc_core", diff --git a/services/audiomanager/test/unittest/servicesource/BUILD.gn b/services/audiomanager/test/unittest/servicesource/BUILD.gn index f5b42b86..034f8ffd 100644 --- a/services/audiomanager/test/unittest/servicesource/BUILD.gn +++ b/services/audiomanager/test/unittest/servicesource/BUILD.gn @@ -24,7 +24,6 @@ config("module_private_config") { include_dirs = [ "${audio_framework_path}/audiopolicy/include", "//drivers/peripheral/audio/interfaces/include", - "//foundation/communication/dsoftbus/interfaces/kits/transport", "//third_party/json/include", "${fwk_common_path}/utils/include", "${mediastandardfwk_path}/audiocapturer/include", @@ -93,6 +92,7 @@ ohos_unittest("DaudioSourceServiceTest") { "audio_framework:audio_client", "audio_framework:audio_renderer", "c_utils:utils", + "dsoftbus:softbus_client", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "ipc:ipc_core", diff --git a/services/audiomanager/test/unittest/source_device/BUILD.gn b/services/audiomanager/test/unittest/source_device/BUILD.gn index 10de2f67..a68ba390 100644 --- a/services/audiomanager/test/unittest/source_device/BUILD.gn +++ b/services/audiomanager/test/unittest/source_device/BUILD.gn @@ -21,8 +21,6 @@ config("module_private_config") { include_dirs = [ "//drivers/peripheral/audio/interfaces/include", - "//foundation/communication/dsoftbus/interfaces/kits/transport", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//third_party/json/include", "${fwk_common_path}/utils/include", "${mediastandardfwk_path}/audiocapturer/include", @@ -78,6 +76,7 @@ ohos_unittest("DaudioSourceDevTest") { external_deps = [ "c_utils:utils", + "dsoftbus:softbus_client", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/services/audiomanager/test/unittest/sourcemanager/BUILD.gn b/services/audiomanager/test/unittest/sourcemanager/BUILD.gn index 2c9eed3a..e732f1dc 100644 --- a/services/audiomanager/test/unittest/sourcemanager/BUILD.gn +++ b/services/audiomanager/test/unittest/sourcemanager/BUILD.gn @@ -21,7 +21,6 @@ config("module_private_config") { include_dirs = [ "//drivers/peripheral/audio/interfaces/include", - "//foundation/communication/dsoftbus/interfaces/kits/transport", "//third_party/json/include", "${fwk_common_path}/utils/include", "${mediastandardfwk_path}/audiocapturer/include", @@ -76,6 +75,7 @@ ohos_unittest("DaudioSourceMgrTest") { external_deps = [ "c_utils:utils", + "dsoftbus:softbus_client", "hdf_core:libhdi", "ipc:ipc_core", "ipc:ipc_single", diff --git a/services/audiotransport/audiochannel/audiodatachannel/BUILD.gn b/services/audiotransport/audiochannel/audiodatachannel/BUILD.gn index d755aa35..983a7910 100644 --- a/services/audiotransport/audiochannel/audiodatachannel/BUILD.gn +++ b/services/audiotransport/audiochannel/audiodatachannel/BUILD.gn @@ -17,7 +17,6 @@ import("../../../../distributedaudio.gni") ohos_shared_library("distributed_audio_data_channel") { include_dirs = [ - "//foundation/communication/dsoftbus/interfaces/kits/transport", "${fwk_common_path}/utils/include", "//third_party/json/include", ] @@ -41,6 +40,7 @@ ohos_shared_library("distributed_audio_data_channel") { external_deps = [ "c_utils:utils", + "dsoftbus:softbus_client", "hitrace_native:hitrace_meter", ] diff --git a/services/audiotransport/audioctrltransport/BUILD.gn b/services/audiotransport/audioctrltransport/BUILD.gn index acd8629c..a039593b 100644 --- a/services/audiotransport/audioctrltransport/BUILD.gn +++ b/services/audiotransport/audioctrltransport/BUILD.gn @@ -18,7 +18,6 @@ import("../../../distributedaudio.gni") ohos_shared_library("distributed_audio_control") { include_dirs = [ "//third_party/json/include", - "//foundation/communication/dsoftbus/interfaces/kits/transport", "${fwk_common_path}/utils/include", ] @@ -46,6 +45,7 @@ ohos_shared_library("distributed_audio_control") { external_deps = [ "c_utils:utils", + "dsoftbus:softbus_client", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", ] diff --git a/services/audiotransport/decodetransport/BUILD.gn b/services/audiotransport/decodetransport/BUILD.gn index 4125bcec..85329ede 100644 --- a/services/audiotransport/decodetransport/BUILD.gn +++ b/services/audiotransport/decodetransport/BUILD.gn @@ -29,7 +29,6 @@ config("decode_transport_pub_config") { ohos_shared_library("distributed_audio_decode_transport") { include_dirs = [ - "//foundation/communication/dsoftbus/interfaces/kits/transport", "${fwk_common_path}/utils/include", "${mediastandard_path}/interfaces/innerkits/native/media/include", "${mediastandardfwk_path}/audiocommon/include", @@ -73,6 +72,7 @@ ohos_shared_library("distributed_audio_decode_transport") { external_deps = [ "c_utils:utils", + "dsoftbus:softbus_client", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "multimedia_player_framework:media_client", diff --git a/services/audiotransport/test/unittest/audioctrlchannel/BUILD.gn b/services/audiotransport/test/unittest/audioctrlchannel/BUILD.gn index 5f2a8b41..998230c2 100644 --- a/services/audiotransport/test/unittest/audioctrlchannel/BUILD.gn +++ b/services/audiotransport/test/unittest/audioctrlchannel/BUILD.gn @@ -22,7 +22,6 @@ config("module_private_config") { include_dirs = [ "//third_party/json/include", - "//foundation/graphic/standard/interfaces/innerkits/surface", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/", ] diff --git a/services/audiotransport/test/unittest/audioctrltransport/BUILD.gn b/services/audiotransport/test/unittest/audioctrltransport/BUILD.gn index 64ccb329..7696159c 100644 --- a/services/audiotransport/test/unittest/audioctrltransport/BUILD.gn +++ b/services/audiotransport/test/unittest/audioctrltransport/BUILD.gn @@ -53,8 +53,6 @@ ohos_unittest("AudioCtrlTransportTest") { "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] - - external_deps = [ "graphic_standard:surface" ] } group("audio_ctrl_transport_test") { diff --git a/services/audiotransport/test/unittest/audiodatachannel/BUILD.gn b/services/audiotransport/test/unittest/audiodatachannel/BUILD.gn index 2a7b0866..f4b60682 100644 --- a/services/audiotransport/test/unittest/audiodatachannel/BUILD.gn +++ b/services/audiotransport/test/unittest/audiodatachannel/BUILD.gn @@ -53,8 +53,6 @@ ohos_unittest("AudioDataChannelTest") { "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] - - external_deps = [ "graphic_standard:surface" ] } group("audio_data_channel_test") { diff --git a/services/audiotransport/test/unittest/decodetransport/BUILD.gn b/services/audiotransport/test/unittest/decodetransport/BUILD.gn index 3d9b8588..ad47021c 100644 --- a/services/audiotransport/test/unittest/decodetransport/BUILD.gn +++ b/services/audiotransport/test/unittest/decodetransport/BUILD.gn @@ -23,7 +23,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//foundation/communication/dsoftbus/interfaces/kits/transport", "${fwk_common_path}/utils/include", "//third_party/json/include", ] @@ -59,6 +58,8 @@ ohos_unittest("DecodeTransportTest") { "//third_party/googletest:gtest_main", ] + external_deps = [ "dsoftbus:softbus_client" ] + defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"daudio_trans_test\"", diff --git a/services/audiotransport/test/unittest/encodetransport/BUILD.gn b/services/audiotransport/test/unittest/encodetransport/BUILD.gn index 0303a744..c6a38a51 100644 --- a/services/audiotransport/test/unittest/encodetransport/BUILD.gn +++ b/services/audiotransport/test/unittest/encodetransport/BUILD.gn @@ -23,7 +23,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//foundation/communication/dsoftbus/interfaces/kits/transport", "${fwk_common_path}/utils/include", "//third_party/json/include", ] @@ -60,6 +59,8 @@ ohos_unittest("EncodeTransportTest") { "//third_party/googletest:gtest_main", ] + external_deps = [ "dsoftbus:softbus_client" ] + defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"daudio_trans_test\"", diff --git a/services/softbusadapter/test/unittest/BUILD.gn b/services/softbusadapter/test/unittest/BUILD.gn index 12eefecb..189137bd 100644 --- a/services/softbusadapter/test/unittest/BUILD.gn +++ b/services/softbusadapter/test/unittest/BUILD.gn @@ -47,8 +47,6 @@ ohos_unittest("SoftBusAdapterTest") { "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] - - external_deps = [ "graphic_standard:surface" ] } group("audio_soft_bus_adapter_test") { -- Gitee