From 4c672af3a04e2de1a27bd28c83b4926c722a5558 Mon Sep 17 00:00:00 2001 From: JanierVan Date: Mon, 24 Apr 2023 02:41:38 +0000 Subject: [PATCH] feat: decouple audio and vendor 2 Signed-off-by: JanierVan --- audio/BUILD.gn | 15 +++--- audio/audio.gni | 33 +++++------- audio/bundle.json | 16 +++--- audio/effect/model/BUILD.gn | 1 - audio/effect/model/src/mock_effect/BUILD.gn | 1 - audio/effect/test/BUILD.gn | 1 - audio/effect/test/unittest/BUILD.gn | 1 - audio/hal/hdi_binder/proxy/BUILD.gn | 3 +- audio/hal/hdi_binder/server/BUILD.gn | 51 +------------------ .../server/include/hdf_audio_server_common.h | 1 + .../server/src/hdf_audio_primary_server.c | 2 +- .../server/src/hdf_audio_server_common.c | 31 ++++++++++- .../server/src/hdf_audio_usb_server.c | 2 +- audio/hal/hdi_passthrough/BUILD.gn | 11 ++-- audio/hal/pathselect/BUILD.gn | 3 +- audio/hdi_service/BUILD.gn | 3 +- audio/hdi_service/pathselect/BUILD.gn | 2 +- audio/hdi_service/primary_impl/BUILD.gn | 4 +- audio/hdi_service/supportlibs/BUILD.gn | 8 +-- audio/supportlibs/BUILD.gn | 9 ++-- audio/test/BUILD.gn | 5 +- audio/test/fuzztest/BUILD.gn | 1 - audio/test/fuzztest/adm_fuzzer/BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - audio/test/fuzztest/audio_hdi_fuzzer/BUILD.gn | 1 - .../audioadapter_fuzzer/BUILD.gn | 1 - .../audiocapture_fuzzer/BUILD.gn | 1 - .../audiomanager_fuzzer/BUILD.gn | 1 - .../audiorender_fuzzer/BUILD.gn | 1 - audio/test/fuzztest/hdi_fuzzer/BUILD.gn | 1 - .../test/fuzztest/hdi_fuzzer/adapter/BUILD.gn | 1 - .../audiocreatecaptureattrs_fuzzer/BUILD.gn | 1 - .../audiocreatecapturedesc_fuzzer/BUILD.gn | 1 - .../audiocreaterenderattrs_fuzzer/BUILD.gn | 1 - .../audiocreaterenderdesc_fuzzer/BUILD.gn | 1 - .../BUILD.gn | 1 - .../audiodestroyrenderrender_fuzzer/BUILD.gn | 1 - .../audiogetalladapters_fuzzer/BUILD.gn | 1 - .../audioloadadapterdesc_fuzzer/BUILD.gn | 1 - .../audioloadadaptermanager_fuzzer/BUILD.gn | 1 - .../audiounloadadaptermanager_fuzzer/BUILD.gn | 1 - .../fuzztest/hdi_fuzzer/attribute/BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../audiogetframecountcapture_fuzzer/BUILD.gn | 1 - .../audiogetframecountrender_fuzzer/BUILD.gn | 1 - .../audiogetframesizecapture_fuzzer/BUILD.gn | 1 - .../audiogetframesizerender_fuzzer/BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../audioselectscenecapture_fuzzer/BUILD.gn | 1 - .../BUILD.gn | 1 - .../audioselectscenerender_fuzzer/BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../test/fuzztest/hdi_fuzzer/capture/BUILD.gn | 1 - .../audiocaptureframecapture_fuzzer/BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../test/fuzztest/hdi_fuzzer/control/BUILD.gn | 1 - .../control/audioflushcapture_fuzzer/BUILD.gn | 1 - .../control/audioflushrender_fuzzer/BUILD.gn | 1 - .../control/audiopausecapture_fuzzer/BUILD.gn | 1 - .../control/audiopauserender_fuzzer/BUILD.gn | 1 - .../audioresumecapture_fuzzer/BUILD.gn | 1 - .../control/audioresumerender_fuzzer/BUILD.gn | 1 - .../control/audiostartcapture_fuzzer/BUILD.gn | 1 - .../control/audiostartrender_fuzzer/BUILD.gn | 1 - .../control/audiostopcapture_fuzzer/BUILD.gn | 1 - .../control/audiostoprender_fuzzer/BUILD.gn | 1 - .../test/fuzztest/hdi_fuzzer/render/BUILD.gn | 1 - .../audiogetchannelmoderender_fuzzer/BUILD.gn | 1 - .../audiogetextraparamsrender_fuzzer/BUILD.gn | 1 - .../audiogetlatencyrender_fuzzer/BUILD.gn | 1 - .../BUILD.gn | 1 - .../audiogetrenderspeedrender_fuzzer/BUILD.gn | 1 - .../audiorenderframerender_fuzzer/BUILD.gn | 1 - .../BUILD.gn | 1 - .../audiosetchannelmoderender_fuzzer/BUILD.gn | 1 - .../audiosetextraparamsrender_fuzzer/BUILD.gn | 1 - .../BUILD.gn | 1 - .../audiosetrenderspeedrender_fuzzer/BUILD.gn | 1 - .../audiosetrenderspeedspeed_fuzzer/BUILD.gn | 1 - .../test/fuzztest/hdi_fuzzer/volume/BUILD.gn | 1 - .../audiogetgaincapture_fuzzer/BUILD.gn | 1 - .../volume/audiogetgainrender_fuzzer/BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../audiogetmutecapture_fuzzer/BUILD.gn | 1 - .../volume/audiogetmuterender_fuzzer/BUILD.gn | 1 - .../audiogetvolumecapture_fuzzer/BUILD.gn | 1 - .../audiogetvolumerender_fuzzer/BUILD.gn | 1 - .../audiosetgaincapture_fuzzer/BUILD.gn | 1 - .../audiosetgaincapturegain_fuzzer/BUILD.gn | 1 - .../volume/audiosetgainrender_fuzzer/BUILD.gn | 1 - .../audiosetgainrendergain_fuzzer/BUILD.gn | 1 - .../audiosetmutecapture_fuzzer/BUILD.gn | 1 - .../audiosetmutecapturemute_fuzzer/BUILD.gn | 1 - .../volume/audiosetmuterender_fuzzer/BUILD.gn | 1 - .../audiosetmuterendermute_fuzzer/BUILD.gn | 1 - .../audiosetvolumecapture_fuzzer/BUILD.gn | 1 - .../BUILD.gn | 1 - .../audiosetvolumerender_fuzzer/BUILD.gn | 1 - .../BUILD.gn | 1 - audio/test/sample/BUILD.gn | 11 ++-- audio/test/systemtest/BUILD.gn | 10 ++-- audio/test/systemtest/README_zh.md | 8 +-- audio/test/systemtest/adm/BUILD.gn | 1 - .../adm/audio_adm_interface/BUILD.gn | 4 -- audio/test/systemtest/audio_adapter/BUILD.gn | 1 - .../audio_adapter/audio_usb/BUILD.gn | 4 +- audio/test/systemtest/audio_function/BUILD.gn | 14 ----- .../audio_function/audio_pathroute/BUILD.gn | 5 +- .../audio_function/audio_server/BUILD.gn | 5 +- .../audio_function/audio_smartpa/BUILD.gn | 5 +- .../audio_threshold_report/BUILD.gn | 3 +- audio/test/systemtest/hdi/BUILD.gn | 7 ++- audio/test/systemtest/hdi/common/BUILD.gn | 1 - .../systemtest/hdi/common/adapter/BUILD.gn | 5 +- .../systemtest/hdi/common/capture/BUILD.gn | 37 +++++++------- .../systemtest/hdi/common/manager/BUILD.gn | 5 +- .../systemtest/hdi/common/render/BUILD.gn | 39 ++++++-------- .../hdi/hardwaredependence/BUILD.gn | 1 - .../hdi/hardwaredependence/capture/BUILD.gn | 12 ++--- .../hdi/hardwaredependence/render/BUILD.gn | 12 ++--- .../systemtest/hdi/hdiperformace/BUILD.gn | 9 ++-- .../systemtest/hdi/hdireliability/BUILD.gn | 18 +++---- audio/test/systemtest/hdi_advance/BUILD.gn | 1 - .../systemtest/hdi_advance/common/BUILD.gn | 2 +- .../hdi_advance/common/adapter/BUILD.gn | 1 - .../hdi_advance/common/capture/BUILD.gn | 1 - .../hdi_advance/common/manager/BUILD.gn | 1 - .../hdi_advance/common/render/BUILD.gn | 4 -- .../hdi_advance/hardwaredependence/BUILD.gn | 2 +- .../hardwaredependence/capture/BUILD.gn | 4 -- .../hardwaredependence/render/BUILD.gn | 4 -- audio/test/systemtest/hdi_service/BUILD.gn | 8 +-- .../systemtest/hdi_service/common/BUILD.gn | 2 +- .../hdi_service/common/capture/BUILD.gn | 2 +- .../hdi_service/common/render/BUILD.gn | 2 +- .../hispark_taurus_standard/BUILD.gn | 2 +- .../hispark_taurus_standard/capture/BUILD.gn | 2 +- .../hispark_taurus_standard/render/BUILD.gn | 2 +- .../systemtest/hdi_service/rk3568/BUILD.gn | 1 - .../hdi_service/rk3568/capture/BUILD.gn | 2 +- .../hdi_service/rk3568/render/BUILD.gn | 2 +- audio/test/systemtest/supportlibs/BUILD.gn | 5 +- .../systemtest/supportlibs/common/BUILD.gn | 2 +- .../supportlibs/common/capture/BUILD.gn | 5 +- .../supportlibs/common/render/BUILD.gn | 5 +- .../supportlibs/hardwaredependence/BUILD.gn | 2 +- .../hardwaredependence/capture/BUILD.gn | 4 -- .../hardwaredependence/render/BUILD.gn | 4 -- audio/test/unittest/BUILD.gn | 5 +- audio/test/unittest/common/BUILD.gn | 1 - audio/test/unittest/hdi/client/BUILD.gn | 3 +- .../test/unittest/hdi/client/adapter/BUILD.gn | 1 - .../test/unittest/hdi/client/capture/BUILD.gn | 1 - .../test/unittest/hdi/client/common/BUILD.gn | 1 - .../test/unittest/hdi/client/manager/BUILD.gn | 1 - .../test/unittest/hdi/client/render/BUILD.gn | 1 - .../test/unittest/hdi/client_advance/BUILD.gn | 3 +- .../hdi/client_advance/adapter/BUILD.gn | 1 - .../hdi/client_advance/capture/BUILD.gn | 1 - .../hdi/client_advance/common/BUILD.gn | 1 - .../hdi/client_advance/manager/BUILD.gn | 1 - .../hdi/client_advance/render/BUILD.gn | 1 - audio/test/unittest/hdi/jack/BUILD.gn | 5 +- audio/test/unittest/hdi/passthrough/BUILD.gn | 1 - .../unittest/hdi/passthrough/adapter/BUILD.gn | 5 +- .../unittest/hdi/passthrough/capture/BUILD.gn | 7 +-- .../unittest/hdi/passthrough/manager/BUILD.gn | 5 +- .../unittest/hdi/passthrough/render/BUILD.gn | 7 +-- audio/test/unittest/supportlibs/BUILD.gn | 1 - .../interface_lib_capture/BUILD.gn | 4 +- .../supportlibs/interface_lib_render/BUILD.gn | 4 +- 202 files changed, 200 insertions(+), 462 deletions(-) diff --git a/audio/BUILD.gn b/audio/BUILD.gn index 7f72317acd..e6fcefc222 100644 --- a/audio/BUILD.gn +++ b/audio/BUILD.gn @@ -12,22 +12,19 @@ # limitations under the License. import("//build/ohos.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("audio.gni") group("hdi_audio") { deps = [] - if (drivers_peripheral_audio_user_mode == false) { - if (drivers_peripheral_audio_rich_device == false) { + if (drivers_peripheral_audio_feature_user_mode == false) { + if (drivers_peripheral_audio_feature_rich_device == false) { deps += [ "hal/hdi_passthrough:hdi_audio" ] } - } else { - deps += [ "//device/soc/${product_company}/common/hal/media:hdi_audio" ] } if (defined(ohos_lite)) { } else { - if (drivers_peripheral_audio_hdf_proxy_stub == true) { + if (drivers_peripheral_audio_feature_hdf_proxy_stub == true) { deps += [ "hal/hdi_binder/proxy:hdi_audio_client", "hal/hdi_binder/server:hdi_audio_a2dp_server", @@ -44,18 +41,18 @@ group("hdi_audio") { ] } - if (drivers_peripheral_audio_user_mode == false) { + if (drivers_peripheral_audio_feature_user_mode == false) { deps += [ "supportlibs:hdi_audio_interface_lib_capture", "supportlibs:hdi_audio_interface_lib_render", ] } - if (drivers_peripheral_audio_hal_notsupport_pathselect == false) { + if (drivers_peripheral_audio_feature_hal_notsupport_pathselect == false) { deps += [ "hal/pathselect:hdi_audio_path_select" ] } - if (drivers_peripheral_audio_policy_config == true) { + if (drivers_peripheral_audio_feature_policy_config == true) { deps += [ "//vendor/${product_company}/${product_name}/audio:audio_policy_config", ] diff --git a/audio/audio.gni b/audio/audio.gni index 6500ef4f0c..2dc7b127bc 100644 --- a/audio/audio.gni +++ b/audio/audio.gni @@ -4,43 +4,36 @@ if (defined(ohos_lite)) { import("${ohos_product_adapter_dir}/audio/product.gni") } else { import("//build/ohos.gni") - if (product_name == "ohos-arm64") { - enable_audio_hal_notsupport_pathselect = false - } } declare_args() { drivers_peripheral_audio_feature_mono_to_stereo = false - drivers_peripheral_audio_hal_notsupport_pathselect = false - drivers_peripheral_audio_hdf_proxy_stub = true - drivers_peripheral_audio_user_mode = false - drivers_peripheral_audio_full_test_suite = false - drivers_peripheral_audio_policy_config = true - drivers_peripheral_audio_alsa_lib = false - drivers_peripheral_audio_rich_device = false - drivers_peripheral_audio_community = true + drivers_peripheral_audio_feature_hal_notsupport_pathselect = false + drivers_peripheral_audio_feature_hdf_proxy_stub = true + drivers_peripheral_audio_feature_user_mode = false + drivers_peripheral_audio_feature_full_test_suite = false + drivers_peripheral_audio_feature_policy_config = true + drivers_peripheral_audio_feature_alsa_lib = false + drivers_peripheral_audio_feature_rich_device = false + drivers_peripheral_audio_feature_community = true drivers_peripheral_audio_feature_effect = false } -if (product_name == "ohos-arm64") { - drivers_peripheral_audio_hal_notsupport_pathselect = false -} - if (defined(ohos_lite)) { if (defined(enable_audio_hal_notsupport_pathselect) && enable_audio_hal_notsupport_pathselect == true) { - drivers_peripheral_audio_hal_notsupport_pathselect = true + drivers_peripheral_audio_feature_hal_notsupport_pathselect = true } else { - drivers_peripheral_audio_hal_notsupport_pathselect = false + drivers_peripheral_audio_feature_hal_notsupport_pathselect = false } if (defined(enable_audio_policy_config) && enable_audio_policy_config == true) { - drivers_peripheral_audio_policy_config = true + drivers_peripheral_audio_feature_policy_config = true } else { - drivers_peripheral_audio_policy_config = false + drivers_peripheral_audio_feature_policy_config = false } if (defined(enable_hdf_audio_full_test_suite)) { - drivers_peripheral_audio_full_test_suite = true + drivers_peripheral_audio_feature_full_test_suite = true } } diff --git a/audio/bundle.json b/audio/bundle.json index 2a806790ef..3aa00acaf9 100755 --- a/audio/bundle.json +++ b/audio/bundle.json @@ -14,14 +14,14 @@ "subsystem": "hdf", "features": [ "drivers_peripheral_audio_feature_mono_to_stereo", - "drivers_peripheral_audio_hal_notsupport_pathselect", - "drivers_peripheral_audio_hdf_proxy_stub", - "drivers_peripheral_audio_user_mode", - "drivers_peripheral_audio_full_test_suite", - "drivers_peripheral_audio_policy_config", - "drivers_peripheral_audio_alsa_lib", - "drivers_peripheral_audio_rich_device", - "drivers_peripheral_audio_community", + "drivers_peripheral_audio_feature_hal_notsupport_pathselect", + "drivers_peripheral_audio_feature_hdf_proxy_stub", + "drivers_peripheral_audio_feature_user_mode", + "drivers_peripheral_audio_feature_full_test_suite", + "drivers_peripheral_audio_feature_policy_config", + "drivers_peripheral_audio_feature_alsa_lib", + "drivers_peripheral_audio_feature_rich_device", + "drivers_peripheral_audio_feature_community", "drivers_peripheral_audio_feature_effect" ], "syscap": [ "" ], diff --git a/audio/effect/model/BUILD.gn b/audio/effect/model/BUILD.gn index a4f2c22f86..2aab81bd58 100644 --- a/audio/effect/model/BUILD.gn +++ b/audio/effect/model/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") if (!defined(ohos_lite)) { ohos_shared_library("effect_model_service_1.0") { diff --git a/audio/effect/model/src/mock_effect/BUILD.gn b/audio/effect/model/src/mock_effect/BUILD.gn index 358f60da55..1d8bac8091 100644 --- a/audio/effect/model/src/mock_effect/BUILD.gn +++ b/audio/effect/model/src/mock_effect/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") if (!defined(ohos_lite)) { ohos_shared_library("mock_effect_lib") { diff --git a/audio/effect/test/BUILD.gn b/audio/effect/test/BUILD.gn index 9bcc275bdc..c45acfd3a6 100644 --- a/audio/effect/test/BUILD.gn +++ b/audio/effect/test/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") group("effect_test") { diff --git a/audio/effect/test/unittest/BUILD.gn b/audio/effect/test/unittest/BUILD.gn index e3d7937d68..dc743e3375 100644 --- a/audio/effect/test/unittest/BUILD.gn +++ b/audio/effect/test/unittest/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") ohos_unittest("hdf_effect_hdi_ut") { module_out_path = "drivers_peripheral_audio/audio" diff --git a/audio/hal/hdi_binder/proxy/BUILD.gn b/audio/hal/hdi_binder/proxy/BUILD.gn index 64bcb94bca..971b130840 100644 --- a/audio/hal/hdi_binder/proxy/BUILD.gn +++ b/audio/hal/hdi_binder/proxy/BUILD.gn @@ -12,10 +12,9 @@ # limitations under the License. import("//build/ohos.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") -if (drivers_peripheral_audio_hdf_proxy_stub == true) { +if (drivers_peripheral_audio_feature_hdf_proxy_stub == true) { if (defined(ohos_lite)) { ohos_shared_library("hdi_audio_client") { include_dirs = [ diff --git a/audio/hal/hdi_binder/server/BUILD.gn b/audio/hal/hdi_binder/server/BUILD.gn index 55c8150751..1c0ca08607 100644 --- a/audio/hal/hdi_binder/server/BUILD.gn +++ b/audio/hal/hdi_binder/server/BUILD.gn @@ -12,10 +12,9 @@ # limitations under the License. import("//build/ohos.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") -if (drivers_peripheral_audio_hdf_proxy_stub == true) { +if (drivers_peripheral_audio_feature_hdf_proxy_stub == true) { ohos_shared_library("hdi_audio_primary_server") { include_dirs = [ "//drivers/peripheral/audio/interfaces/include", @@ -33,22 +32,6 @@ if (drivers_peripheral_audio_hdf_proxy_stub == true) { ] deps = [ "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio_common" ] - if (!drivers_peripheral_audio_user_mode) { - if (drivers_peripheral_audio_rich_device == false) { - deps += [ "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio" ] - } else { - AUDIO_VENDOR_LIB_PATH = rebase_path( - "//vendor/$device_company/ap/prebuilt_scripts/ohos_vendor/vendorlibs/audio_hdi") - cmd = "if [ -f ${AUDIO_VENDOR_LIB_PATH}/BUILD.gn ]; then echo true; else echo false; fi" - HAVE_AUDIO_VENDOR_LIB = - exec_script("//build/lite/run_shell_cmd.py", [ cmd ], "value") - if (HAVE_AUDIO_VENDOR_LIB) { - deps += [ "${AUDIO_VENDOR_LIB_PATH}:hdi_audio" ] - } - } - } else { - deps += [ "//device/soc/${product_company}/common/hal/media:hdi_audio" ] - } defines = [] if (is_standard_system) { @@ -89,22 +72,6 @@ if (drivers_peripheral_audio_hdf_proxy_stub == true) { ] deps = [ "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio_common" ] - if (!drivers_peripheral_audio_user_mode) { - if (drivers_peripheral_audio_rich_device == false) { - deps += [ "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio" ] - } else { - AUDIO_VENDOR_LIB_PATH = rebase_path( - "//vendor/$device_company/ap/prebuilt_scripts/ohos_vendor/vendorlibs/audio_hdi") - cmd = "if [ -f ${AUDIO_VENDOR_LIB_PATH}/BUILD.gn ]; then echo true; else echo false; fi" - HAVE_AUDIO_VENDOR_LIB = - exec_script("//build/lite/run_shell_cmd.py", [ cmd ], "value") - if (HAVE_AUDIO_VENDOR_LIB) { - deps += [ "${AUDIO_VENDOR_LIB_PATH}:hdi_audio" ] - } - } - } else { - deps += [ "//device/soc/${product_company}/common/hal/media:hdi_audio" ] - } if (is_standard_system) { external_deps = [ "c_utils:utils", @@ -143,22 +110,6 @@ if (drivers_peripheral_audio_hdf_proxy_stub == true) { ] deps = [ "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio_common" ] - if (!drivers_peripheral_audio_user_mode) { - if (drivers_peripheral_audio_rich_device == false) { - deps += [ "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio" ] - } else { - AUDIO_VENDOR_LIB_PATH = rebase_path( - "//vendor/$device_company/ap/prebuilt_scripts/ohos_vendor/vendorlibs/audio_hdi") - cmd = "if [ -f ${AUDIO_VENDOR_LIB_PATH}/BUILD.gn ]; then echo true; else echo false; fi" - HAVE_AUDIO_VENDOR_LIB = - exec_script("//build/lite/run_shell_cmd.py", [ cmd ], "value") - if (HAVE_AUDIO_VENDOR_LIB) { - deps += [ "${AUDIO_VENDOR_LIB_PATH}:hdi_audio" ] - } - } - } else { - deps += [ "//device/soc/${product_company}/common/hal/media:hdi_audio" ] - } if (is_standard_system) { external_deps = [ "c_utils:utils", diff --git a/audio/hal/hdi_binder/server/include/hdf_audio_server_common.h b/audio/hal/hdi_binder/server/include/hdf_audio_server_common.h index 293945e6f1..28b3768e54 100644 --- a/audio/hal/hdi_binder/server/include/hdf_audio_server_common.h +++ b/audio/hal/hdi_binder/server/include/hdf_audio_server_common.h @@ -101,6 +101,7 @@ int32_t HdiServicePositionWrite(struct HdfSBuf *reply, int32_t HdiServiceReqMmapBuffer(struct AudioMmapBufferDescriptor *desc, struct HdfSBuf *data); int32_t HdiServiceGetFuncs(); +void AudioHdiServerRelease(); int32_t HdiServiceGetAllAdapter(const struct HdfDeviceIoClient *client, struct HdfSBuf *data, struct HdfSBuf *reply); int32_t HdiServiceLoadAdapter(const struct HdfDeviceIoClient *client, diff --git a/audio/hal/hdi_binder/server/src/hdf_audio_primary_server.c b/audio/hal/hdi_binder/server/src/hdf_audio_primary_server.c index d56331aa70..6c8e09059f 100644 --- a/audio/hal/hdi_binder/server/src/hdf_audio_primary_server.c +++ b/audio/hal/hdi_binder/server/src/hdf_audio_primary_server.c @@ -28,7 +28,7 @@ static void AudioHdiPrimaryServerRelease(struct HdfDeviceObject *deviceObject) AUDIO_FUNC_LOGI("enter!"); /* g_renderAndCaptureManage release */ AdaptersServerManageInfomationRecycle(); - ReleaseAudioManagerObjectComm(GetAudioManagerFuncs()); + AudioHdiServerRelease(); if (deviceObject == NULL) { AUDIO_FUNC_LOGE("Parameter is null!"); diff --git a/audio/hal/hdi_binder/server/src/hdf_audio_server_common.c b/audio/hal/hdi_binder/server/src/hdf_audio_server_common.c index 363b4eb9f5..d6476116c8 100644 --- a/audio/hal/hdi_binder/server/src/hdf_audio_server_common.c +++ b/audio/hal/hdi_binder/server/src/hdf_audio_server_common.c @@ -1166,15 +1166,42 @@ int32_t HdiServiceGetFuncs() if (g_serverManager != NULL) { return AUDIO_HAL_SUCCESS; } - g_serverManager = GetAudioManagerFuncs(); + + char *error = NULL; + struct AudioManager *(*managerFuncs)(void); + const char *hdiAudioVendorLibPath = HDF_LIBRARY_FULL_PATH("libhdi_audio"); + void *handle = dlopen(hdiAudioVendorLibPath, RTLD_LAZY); + if (handle == NULL) { + error = dlerror(); + AUDIO_FUNC_LOGE("audio load path %{public}s, dlopen err=%{public}s", hdiAudioVendorLibPath, error); + return AUDIO_HAL_ERR_INTERNAL; + } + managerFuncs = dlsym(handle, "GetAudioManagerFuncs"); + g_serverManager = managerFuncs(); if (g_serverManager == NULL) { - AUDIO_FUNC_LOGE("GetAudioManagerFuncs FAIL!"); + error = dlerror(); + AUDIO_FUNC_LOGE("dlsym GetAudioManagerFuncs err=%{public}s", error); + dlclose(handle); + handle = NULL; return AUDIO_HAL_ERR_INTERNAL; } AUDIO_FUNC_LOGD("end"); return AUDIO_HAL_SUCCESS; } +void AudioHdiServerRelease() +{ + AUDIO_FUNC_LOGI("enter to %{public}s!", __func__); + + if (g_serverManager == NULL) { + AUDIO_FUNC_LOGE("manager func is null!"); + return; + } + ReleaseAudioManagerObjectComm(g_serverManager); + AUDIO_FUNC_LOGD("%{public}s success", __func__); + return; +} + int32_t HdiServiceGetAllAdapter(const struct HdfDeviceIoClient *client, struct HdfSBuf *data, struct HdfSBuf *reply) { diff --git a/audio/hal/hdi_binder/server/src/hdf_audio_usb_server.c b/audio/hal/hdi_binder/server/src/hdf_audio_usb_server.c index 74914c89c4..91d62d6999 100644 --- a/audio/hal/hdi_binder/server/src/hdf_audio_usb_server.c +++ b/audio/hal/hdi_binder/server/src/hdf_audio_usb_server.c @@ -26,7 +26,7 @@ static void AudioHdiUsbServerRelease(struct HdfDeviceObject *deviceObject) AUDIO_FUNC_LOGI("enter!"); /* g_renderAndCaptureManage release */ AdaptersServerManageInfomationRecycle(); - ReleaseAudioManagerObjectComm(GetAudioManagerFuncs()); + AudioHdiServerRelease(); if (deviceObject == NULL) { AUDIO_FUNC_LOGE("deviceObject is null!"); diff --git a/audio/hal/hdi_passthrough/BUILD.gn b/audio/hal/hdi_passthrough/BUILD.gn index 623a788ff3..bacb93345d 100644 --- a/audio/hal/hdi_passthrough/BUILD.gn +++ b/audio/hal/hdi_passthrough/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") if (defined(ohos_lite)) { @@ -39,7 +38,7 @@ if (defined(ohos_lite)) { ] external_deps = [ "hdf_core:libhdf_utils" ] defines = [] - if (drivers_peripheral_audio_hal_notsupport_pathselect) { + if (drivers_peripheral_audio_feature_hal_notsupport_pathselect) { defines += [ "AUDIO_HAL_NOTSUPPORT_PATHSELECT" ] } @@ -58,7 +57,7 @@ if (defined(ohos_lite)) { part_name = "drivers_peripheral_audio" } } else { - if (!drivers_peripheral_audio_user_mode) { + if (!drivers_peripheral_audio_feature_user_mode) { ohos_shared_library("hdi_audio") { sources = [ "src/audio_adapter.c", @@ -78,7 +77,7 @@ if (defined(ohos_lite)) { defines = [] - if (drivers_peripheral_audio_hal_notsupport_pathselect) { + if (drivers_peripheral_audio_feature_hal_notsupport_pathselect) { defines += [ "AUDIO_HAL_NOTSUPPORT_PATHSELECT" ] } if (enable_audio_hal_hdf_log) { @@ -125,7 +124,7 @@ if (defined(ohos_lite)) { ] external_deps = [ "hdf_core:libhdf_utils" ] defines = [] - if (drivers_peripheral_audio_hal_notsupport_pathselect) { + if (drivers_peripheral_audio_feature_hal_notsupport_pathselect) { defines += [ "AUDIO_HAL_NOTSUPPORT_PATHSELECT" ] } @@ -159,7 +158,7 @@ if (defined(ohos_lite)) { defines = [] - if (drivers_peripheral_audio_hal_notsupport_pathselect) { + if (drivers_peripheral_audio_feature_hal_notsupport_pathselect) { defines += [ "AUDIO_HAL_NOTSUPPORT_PATHSELECT" ] } diff --git a/audio/hal/pathselect/BUILD.gn b/audio/hal/pathselect/BUILD.gn index 01049ca0cb..01889860c8 100644 --- a/audio/hal/pathselect/BUILD.gn +++ b/audio/hal/pathselect/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") if (defined(ohos_lite)) { @@ -61,7 +60,7 @@ if (defined(ohos_lite)) { defines += [ "AUDIO_HDF_LOG" ] } - if (drivers_peripheral_audio_alsa_lib) { + if (drivers_peripheral_audio_feature_alsa_lib) { defines += [ "ALSA_LIB_MODE" ] } diff --git a/audio/hdi_service/BUILD.gn b/audio/hdi_service/BUILD.gn index 8b586eb703..99c6ce82e1 100644 --- a/audio/hdi_service/BUILD.gn +++ b/audio/hdi_service/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") group("idl_audio") { @@ -22,7 +21,7 @@ group("idl_audio") { "primary_impl:audio_primary_impl_vendor", ] - if (drivers_peripheral_audio_community) { + if (drivers_peripheral_audio_feature_community) { deps += [ "pathselect:audio_path_select", "supportlibs:audio_capture_adapter", diff --git a/audio/hdi_service/pathselect/BUILD.gn b/audio/hdi_service/pathselect/BUILD.gn index 2b0db78b88..735acb44ec 100644 --- a/audio/hdi_service/pathselect/BUILD.gn +++ b/audio/hdi_service/pathselect/BUILD.gn @@ -34,7 +34,7 @@ ohos_shared_library("audio_path_select") { if (enable_audio_hal_hdf_log) { defines += [ "AUDIO_HDF_LOG" ] } - if (drivers_peripheral_audio_alsa_lib) { + if (drivers_peripheral_audio_feature_alsa_lib) { defines += [ "ALSA_LIB_MODE" ] } if (is_standard_system) { diff --git a/audio/hdi_service/primary_impl/BUILD.gn b/audio/hdi_service/primary_impl/BUILD.gn index ae34e1a7ca..bf99f58cc2 100644 --- a/audio/hdi_service/primary_impl/BUILD.gn +++ b/audio/hdi_service/primary_impl/BUILD.gn @@ -17,7 +17,7 @@ import("//drivers/peripheral/audio/audio.gni") ohos_shared_library("audio_primary_impl_vendor") { defines = [] - if (drivers_peripheral_audio_community) { + if (drivers_peripheral_audio_feature_community) { sources = [ "src/audio_adapter.c", "src/audio_adapter_info_common.c", @@ -36,7 +36,7 @@ ohos_shared_library("audio_primary_impl_vendor") { "//drivers/peripheral/audio/hdi_service/vendor_interface/utils", ] - if (drivers_peripheral_audio_hal_notsupport_pathselect) { + if (drivers_peripheral_audio_feature_hal_notsupport_pathselect) { defines += [ "AUDIO_HAL_NOTSUPPORT_PATHSELECT" ] } } else { diff --git a/audio/hdi_service/supportlibs/BUILD.gn b/audio/hdi_service/supportlibs/BUILD.gn index e8fc21f739..778379b804 100644 --- a/audio/hdi_service/supportlibs/BUILD.gn +++ b/audio/hdi_service/supportlibs/BUILD.gn @@ -77,7 +77,7 @@ if (defined(ohos_lite)) { sources = [ "//drivers/peripheral/audio/hdi_service/primary_impl/src/audio_common.c", ] - if (drivers_peripheral_audio_alsa_lib) { + if (drivers_peripheral_audio_feature_alsa_lib) { sources += [ "//drivers/peripheral/audio/supportlibs/alsa_adapter/src/alsa_lib_capture.c", "//drivers/peripheral/audio/supportlibs/alsa_adapter/src/alsa_lib_common.c", @@ -98,7 +98,7 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/hdi_service/vendor_interface/utils", ] - if (drivers_peripheral_audio_alsa_lib) { + if (drivers_peripheral_audio_feature_alsa_lib) { include_dirs += [ "//third_party/cJSON", "//third_party/alsa-lib/include", @@ -136,7 +136,7 @@ if (defined(ohos_lite)) { sources = [ "//drivers/peripheral/audio/hdi_service/primary_impl/src/audio_common.c", ] - if (drivers_peripheral_audio_alsa_lib) { + if (drivers_peripheral_audio_feature_alsa_lib) { sources += [ "//drivers/peripheral/audio/supportlibs/alsa_adapter/src/alsa_lib_common.c", "//drivers/peripheral/audio/supportlibs/alsa_adapter/src/alsa_lib_render.c", @@ -158,7 +158,7 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/hdi_service/vendor_interface/utils", ] - if (drivers_peripheral_audio_alsa_lib) { + if (drivers_peripheral_audio_feature_alsa_lib) { include_dirs += [ "//third_party/cJSON", "//third_party/alsa-lib/include", diff --git a/audio/supportlibs/BUILD.gn b/audio/supportlibs/BUILD.gn index 68fe69d202..aa2b0543d1 100644 --- a/audio/supportlibs/BUILD.gn +++ b/audio/supportlibs/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") config("audio_interface_config") { @@ -89,7 +88,7 @@ if (defined(ohos_lite)) { ohos_shared_library("hdi_audio_interface_lib_capture") { sources = [ "//drivers/peripheral/audio/hal/hdi_passthrough/src/audio_common.c" ] - if (drivers_peripheral_audio_alsa_lib) { + if (drivers_peripheral_audio_feature_alsa_lib) { sources += [ "//drivers/peripheral/audio/supportlibs/alsa_adapter/src/alsa_lib_capture.c", "//drivers/peripheral/audio/supportlibs/alsa_adapter/src/alsa_lib_common.c", @@ -116,7 +115,7 @@ if (defined(ohos_lite)) { defines = [ "AUDIO_HDF_LOG" ] } - if (drivers_peripheral_audio_alsa_lib) { + if (drivers_peripheral_audio_feature_alsa_lib) { include_dirs += [ "//third_party/alsa-lib/include", "//drivers/peripheral/audio/supportlibs/alsa_adapter/include", @@ -147,7 +146,7 @@ if (defined(ohos_lite)) { ohos_shared_library("hdi_audio_interface_lib_render") { sources = [ "//drivers/peripheral/audio/hal/hdi_passthrough/src/audio_common.c" ] - if (drivers_peripheral_audio_alsa_lib) { + if (drivers_peripheral_audio_feature_alsa_lib) { sources += [ "//drivers/peripheral/audio/supportlibs/alsa_adapter/src/alsa_lib_common.c", "//drivers/peripheral/audio/supportlibs/alsa_adapter/src/alsa_lib_render.c", @@ -175,7 +174,7 @@ if (defined(ohos_lite)) { defines = [ "AUDIO_HDF_LOG" ] } - if (drivers_peripheral_audio_alsa_lib) { + if (drivers_peripheral_audio_feature_alsa_lib) { include_dirs += [ "//drivers/peripheral/audio/supportlibs/alsa_adapter/include", "//third_party/alsa-lib/include", diff --git a/audio/test/BUILD.gn b/audio/test/BUILD.gn index f31a56e7e8..a83e9dc324 100644 --- a/audio/test/BUILD.gn +++ b/audio/test/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") if (defined(ohos_lite)) { @@ -21,7 +20,7 @@ if (defined(ohos_lite)) { } } else { group("audio_test_entry") { - if (drivers_peripheral_audio_hdf_proxy_stub == true) { + if (drivers_peripheral_audio_feature_hdf_proxy_stub == true) { testonly = true deps = [ "benchmarktest:hdf_audio_benchmark_test", @@ -29,7 +28,7 @@ if (defined(ohos_lite)) { "unittest:audiotest", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { deps += [ "fuzztest:fuzztest" ] } } diff --git a/audio/test/fuzztest/BUILD.gn b/audio/test/fuzztest/BUILD.gn index 48add439cf..5595ba4f42 100644 --- a/audio/test/fuzztest/BUILD.gn +++ b/audio/test/fuzztest/BUILD.gn @@ -14,7 +14,6 @@ import("//build/config/features.gni") import("//build/test.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") group("fuzztest") { testonly = true diff --git a/audio/test/fuzztest/adm_fuzzer/BUILD.gn b/audio/test/fuzztest/adm_fuzzer/BUILD.gn index ffb2392fe3..2dc9e56ae4 100644 --- a/audio/test/fuzztest/adm_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/adm_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") group("adm_fuzzer") { diff --git a/audio/test/fuzztest/adm_fuzzer/audioadmdispatchercapturecmdid_fuzzer/BUILD.gn b/audio/test/fuzztest/adm_fuzzer/audioadmdispatchercapturecmdid_fuzzer/BUILD.gn index 221ab34813..77616ac5b7 100644 --- a/audio/test/fuzztest/adm_fuzzer/audioadmdispatchercapturecmdid_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/adm_fuzzer/audioadmdispatchercapturecmdid_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/adm_fuzzer/audioadmdispatchercontrolcmdid_fuzzer/BUILD.gn b/audio/test/fuzztest/adm_fuzzer/audioadmdispatchercontrolcmdid_fuzzer/BUILD.gn index bd9e226dd2..4ffe01e9f3 100644 --- a/audio/test/fuzztest/adm_fuzzer/audioadmdispatchercontrolcmdid_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/adm_fuzzer/audioadmdispatchercontrolcmdid_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/adm_fuzzer/audioadmdispatcherrendercmdid_fuzzer/BUILD.gn b/audio/test/fuzztest/adm_fuzzer/audioadmdispatcherrendercmdid_fuzzer/BUILD.gn index ca067c67f8..154a070776 100644 --- a/audio/test/fuzztest/adm_fuzzer/audioadmdispatcherrendercmdid_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/adm_fuzzer/audioadmdispatcherrendercmdid_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/adm_fuzzer/audiointerfacelibctlcapturecmdid_fuzzer/BUILD.gn b/audio/test/fuzztest/adm_fuzzer/audiointerfacelibctlcapturecmdid_fuzzer/BUILD.gn index 72ebed73a7..9ced76a8fa 100644 --- a/audio/test/fuzztest/adm_fuzzer/audiointerfacelibctlcapturecmdid_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/adm_fuzzer/audiointerfacelibctlcapturecmdid_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/adm_fuzzer/audiointerfacelibctlrendercmdid_fuzzer/BUILD.gn b/audio/test/fuzztest/adm_fuzzer/audiointerfacelibctlrendercmdid_fuzzer/BUILD.gn index c8f05c71a9..a0b4258919 100644 --- a/audio/test/fuzztest/adm_fuzzer/audiointerfacelibctlrendercmdid_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/adm_fuzzer/audiointerfacelibctlrendercmdid_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/adm_fuzzer/audiointerfaceliboutputcapturecmdid_fuzzer/BUILD.gn b/audio/test/fuzztest/adm_fuzzer/audiointerfaceliboutputcapturecmdid_fuzzer/BUILD.gn index c612cd2fa4..c3f4d4266f 100644 --- a/audio/test/fuzztest/adm_fuzzer/audiointerfaceliboutputcapturecmdid_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/adm_fuzzer/audiointerfaceliboutputcapturecmdid_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/adm_fuzzer/audiointerfaceliboutputrendercmdid_fuzzer/BUILD.gn b/audio/test/fuzztest/adm_fuzzer/audiointerfaceliboutputrendercmdid_fuzzer/BUILD.gn index c24a2e365b..6a08375c78 100644 --- a/audio/test/fuzztest/adm_fuzzer/audiointerfaceliboutputrendercmdid_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/adm_fuzzer/audiointerfaceliboutputrendercmdid_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/adm_fuzzer/audiolibaudiobindservicecapture_fuzzer/BUILD.gn b/audio/test/fuzztest/adm_fuzzer/audiolibaudiobindservicecapture_fuzzer/BUILD.gn index 1dad6df5c8..76a4e2cc03 100644 --- a/audio/test/fuzztest/adm_fuzzer/audiolibaudiobindservicecapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/adm_fuzzer/audiolibaudiobindservicecapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/adm_fuzzer/audiolibaudiobindservicerender_fuzzer/BUILD.gn b/audio/test/fuzztest/adm_fuzzer/audiolibaudiobindservicerender_fuzzer/BUILD.gn index 19e7ea672b..cb2b363e14 100644 --- a/audio/test/fuzztest/adm_fuzzer/audiolibaudiobindservicerender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/adm_fuzzer/audiolibaudiobindservicerender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/audio_hdi_fuzzer/BUILD.gn b/audio/test/fuzztest/audio_hdi_fuzzer/BUILD.gn index af6faf4467..8a12d1baf0 100644 --- a/audio/test/fuzztest/audio_hdi_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/audio_hdi_fuzzer/BUILD.gn @@ -14,7 +14,6 @@ import("//build/config/features.gni") import("//build/test.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") group("audio_hdi_fuzzer") { testonly = true diff --git a/audio/test/fuzztest/audio_hdi_fuzzer/audioadapter_fuzzer/BUILD.gn b/audio/test/fuzztest/audio_hdi_fuzzer/audioadapter_fuzzer/BUILD.gn index aa9fec39f7..06f3ea0b57 100644 --- a/audio/test/fuzztest/audio_hdi_fuzzer/audioadapter_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/audio_hdi_fuzzer/audioadapter_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "drivers_peripheral_audio/audio" diff --git a/audio/test/fuzztest/audio_hdi_fuzzer/audiocapture_fuzzer/BUILD.gn b/audio/test/fuzztest/audio_hdi_fuzzer/audiocapture_fuzzer/BUILD.gn index cd81d6f37c..3b43843e03 100644 --- a/audio/test/fuzztest/audio_hdi_fuzzer/audiocapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/audio_hdi_fuzzer/audiocapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "drivers_peripheral_audio/audio" diff --git a/audio/test/fuzztest/audio_hdi_fuzzer/audiomanager_fuzzer/BUILD.gn b/audio/test/fuzztest/audio_hdi_fuzzer/audiomanager_fuzzer/BUILD.gn index 218b78445a..ea9375aebf 100644 --- a/audio/test/fuzztest/audio_hdi_fuzzer/audiomanager_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/audio_hdi_fuzzer/audiomanager_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "drivers_peripheral_audio/audio" diff --git a/audio/test/fuzztest/audio_hdi_fuzzer/audiorender_fuzzer/BUILD.gn b/audio/test/fuzztest/audio_hdi_fuzzer/audiorender_fuzzer/BUILD.gn index a1dc706aa3..13c0b933aa 100644 --- a/audio/test/fuzztest/audio_hdi_fuzzer/audiorender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/audio_hdi_fuzzer/audiorender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "drivers_peripheral_audio/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/BUILD.gn index 971e49f4a0..3347bd4def 100644 --- a/audio/test/fuzztest/hdi_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/BUILD.gn @@ -14,7 +14,6 @@ import("//build/config/features.gni") import("//build/test.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") group("hdi_fuzzer") { testonly = true diff --git a/audio/test/fuzztest/hdi_fuzzer/adapter/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/adapter/BUILD.gn index 04ee47aaad..ef89b37f52 100644 --- a/audio/test/fuzztest/hdi_fuzzer/adapter/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/adapter/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/test.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") group("adapter") { diff --git a/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreatecaptureattrs_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreatecaptureattrs_fuzzer/BUILD.gn index 03a20f6e87..6fef34d11b 100644 --- a/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreatecaptureattrs_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreatecaptureattrs_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreatecapturedesc_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreatecapturedesc_fuzzer/BUILD.gn index c428f46c9d..328db07d7f 100644 --- a/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreatecapturedesc_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreatecapturedesc_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreaterenderattrs_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreaterenderattrs_fuzzer/BUILD.gn index cb53c83e99..01f6a991a4 100644 --- a/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreaterenderattrs_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreaterenderattrs_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreaterenderdesc_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreaterenderdesc_fuzzer/BUILD.gn index 30ed541d76..c75fc7822d 100644 --- a/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreaterenderdesc_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreaterenderdesc_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/adapter/audiodestroycapturecapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/adapter/audiodestroycapturecapture_fuzzer/BUILD.gn index 41575bfb3e..4cd3213eea 100644 --- a/audio/test/fuzztest/hdi_fuzzer/adapter/audiodestroycapturecapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/adapter/audiodestroycapturecapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/adapter/audiodestroyrenderrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/adapter/audiodestroyrenderrender_fuzzer/BUILD.gn index 058f2502e5..d590285478 100644 --- a/audio/test/fuzztest/hdi_fuzzer/adapter/audiodestroyrenderrender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/adapter/audiodestroyrenderrender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/adapter/audiogetalladapters_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/adapter/audiogetalladapters_fuzzer/BUILD.gn index dc9ca760b3..5b544e59db 100755 --- a/audio/test/fuzztest/hdi_fuzzer/adapter/audiogetalladapters_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/adapter/audiogetalladapters_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/adapter/audioloadadapterdesc_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/adapter/audioloadadapterdesc_fuzzer/BUILD.gn index 7953b97475..809b2f306a 100644 --- a/audio/test/fuzztest/hdi_fuzzer/adapter/audioloadadapterdesc_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/adapter/audioloadadapterdesc_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/adapter/audioloadadaptermanager_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/adapter/audioloadadaptermanager_fuzzer/BUILD.gn index 82c1b275bc..b018082004 100644 --- a/audio/test/fuzztest/hdi_fuzzer/adapter/audioloadadaptermanager_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/adapter/audioloadadaptermanager_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/adapter/audiounloadadaptermanager_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/adapter/audiounloadadaptermanager_fuzzer/BUILD.gn index 0a91b29d22..c62ac095c2 100644 --- a/audio/test/fuzztest/hdi_fuzzer/adapter/audiounloadadaptermanager_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/adapter/audiounloadadaptermanager_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/BUILD.gn index 5b325e5d49..9a6cde4ebd 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/test.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") group("attribute") { diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturegetmmappositioncapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturegetmmappositioncapture_fuzzer/BUILD.gn index 565cb63ef5..858675d6f2 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturegetmmappositioncapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturegetmmappositioncapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbuffercapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbuffercapture_fuzzer/BUILD.gn index 528cdf873e..0f0a35d319 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbuffercapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbuffercapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbufferdesc_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbufferdesc_fuzzer/BUILD.gn index 136580b13a..91d311acc7 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbufferdesc_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbufferdesc_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbufferreqsize_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbufferreqsize_fuzzer/BUILD.gn index 0245225a7e..7f1feb0ed5 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbufferreqsize_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbufferreqsize_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilitycapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilitycapture_fuzzer/BUILD.gn index b908894e0b..9960d88a76 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilitycapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilitycapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilitycapturescene_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilitycapturescene_fuzzer/BUILD.gn index 8ac9d42389..2ef0d97342 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilitycapturescene_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilitycapturescene_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilityrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilityrender_fuzzer/BUILD.gn index 7f12aaae48..c82574e658 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilityrender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilityrender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilityrenderscene_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilityrenderscene_fuzzer/BUILD.gn index bd4a0276b2..fd8108f21b 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilityrenderscene_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilityrenderscene_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetcurrentchannelidcapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetcurrentchannelidcapture_fuzzer/BUILD.gn index 408ac6d436..71f9275b88 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetcurrentchannelidcapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetcurrentchannelidcapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetcurrentchannelidrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetcurrentchannelidrender_fuzzer/BUILD.gn index 9b573408e3..e358f11015 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetcurrentchannelidrender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetcurrentchannelidrender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframecountcapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframecountcapture_fuzzer/BUILD.gn index a361bae0a3..b3150e6f48 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframecountcapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframecountcapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframecountrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframecountrender_fuzzer/BUILD.gn index ae0e43fc45..5bae499dac 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframecountrender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframecountrender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframesizecapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframesizecapture_fuzzer/BUILD.gn index 20fbe244f6..4cad852319 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframesizecapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframesizecapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframesizerender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframesizerender_fuzzer/BUILD.gn index 4565cc4c6a..e04dff345a 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframesizerender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframesizerender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetsampleattributescapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetsampleattributescapture_fuzzer/BUILD.gn index 38a8e42cf8..af89dfab69 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetsampleattributescapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetsampleattributescapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetsampleattributesrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetsampleattributesrender_fuzzer/BUILD.gn index 15c4c45518..6512f7d02c 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetsampleattributesrender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetsampleattributesrender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiorendergetmmappositionrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiorendergetmmappositionrender_fuzzer/BUILD.gn index 10412c576f..729e848b8f 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiorendergetmmappositionrender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiorendergetmmappositionrender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferdesc_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferdesc_fuzzer/BUILD.gn index 83b08acc58..538a89d4c8 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferdesc_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferdesc_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferrender_fuzzer/BUILD.gn index 0ab7954e82..17c2f8b45b 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferrender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferrender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferreqsize_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferreqsize_fuzzer/BUILD.gn index 5f30aab249..a57eb54bb4 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferreqsize_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferreqsize_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenecapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenecapture_fuzzer/BUILD.gn index 5b4da1b5d6..ec02f08627 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenecapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenecapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenecapturescene_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenecapturescene_fuzzer/BUILD.gn index 90d3b9df4c..cccadbc957 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenecapturescene_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenecapturescene_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenerender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenerender_fuzzer/BUILD.gn index d6d880f89c..12f9f1d4c5 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenerender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenerender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenerenderscene_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenerenderscene_fuzzer/BUILD.gn index fdce58a121..35c1b9d083 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenerenderscene_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenerenderscene_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributescapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributescapture_fuzzer/BUILD.gn index c883b432b0..89d688bbdd 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributescapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributescapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributescaptureattrs_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributescaptureattrs_fuzzer/BUILD.gn index 7376df04c6..cf1b0d4304 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributescaptureattrs_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributescaptureattrs_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributesrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributesrender_fuzzer/BUILD.gn index 5d4957a22b..a1165f8713 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributesrender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributesrender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributesrenderattrs_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributesrenderattrs_fuzzer/BUILD.gn index 5eddc17931..db4a2bcc2d 100644 --- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributesrenderattrs_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributesrenderattrs_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/capture/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/capture/BUILD.gn index 501d7954c3..179fd7891d 100644 --- a/audio/test/fuzztest/hdi_fuzzer/capture/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/capture/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/test.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") group("capture") { diff --git a/audio/test/fuzztest/hdi_fuzzer/capture/audiocaptureframecapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/capture/audiocaptureframecapture_fuzzer/BUILD.gn index 5fcac13dd1..c9c6000c91 100644 --- a/audio/test/fuzztest/hdi_fuzzer/capture/audiocaptureframecapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/capture/audiocaptureframecapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/capture/audiocaptureframerequestbytes_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/capture/audiocaptureframerequestbytes_fuzzer/BUILD.gn index 27ff96b499..0158e23f71 100644 --- a/audio/test/fuzztest/hdi_fuzzer/capture/audiocaptureframerequestbytes_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/capture/audiocaptureframerequestbytes_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/capture/audiogetcapturepositioncapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/capture/audiogetcapturepositioncapture_fuzzer/BUILD.gn index 8be5c0d133..0f714b51b8 100644 --- a/audio/test/fuzztest/hdi_fuzzer/capture/audiogetcapturepositioncapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/capture/audiogetcapturepositioncapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/capture/audiogetextraparamscapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/capture/audiogetextraparamscapture_fuzzer/BUILD.gn index 5218b30547..ff0910292e 100644 --- a/audio/test/fuzztest/hdi_fuzzer/capture/audiogetextraparamscapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/capture/audiogetextraparamscapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/capture/audiosetextraparamscapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/capture/audiosetextraparamscapture_fuzzer/BUILD.gn index 8a6bc556f0..41bcef673d 100644 --- a/audio/test/fuzztest/hdi_fuzzer/capture/audiosetextraparamscapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/capture/audiosetextraparamscapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/capture/audiosetextraparamscapturekeyvaluelist_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/capture/audiosetextraparamscapturekeyvaluelist_fuzzer/BUILD.gn index f0e33f7437..92dd7a6e6e 100644 --- a/audio/test/fuzztest/hdi_fuzzer/capture/audiosetextraparamscapturekeyvaluelist_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/capture/audiosetextraparamscapturekeyvaluelist_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/control/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/control/BUILD.gn index 5b3c944e0c..09ab118ec9 100644 --- a/audio/test/fuzztest/hdi_fuzzer/control/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/control/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/test.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") group("control") { diff --git a/audio/test/fuzztest/hdi_fuzzer/control/audioflushcapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/control/audioflushcapture_fuzzer/BUILD.gn index eebf57f7df..c907f4e9b4 100644 --- a/audio/test/fuzztest/hdi_fuzzer/control/audioflushcapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/control/audioflushcapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/control/audioflushrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/control/audioflushrender_fuzzer/BUILD.gn index 3398c1f5e5..57357ee98d 100644 --- a/audio/test/fuzztest/hdi_fuzzer/control/audioflushrender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/control/audioflushrender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/control/audiopausecapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/control/audiopausecapture_fuzzer/BUILD.gn index 7fc12ffac7..264d95c11c 100644 --- a/audio/test/fuzztest/hdi_fuzzer/control/audiopausecapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/control/audiopausecapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/control/audiopauserender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/control/audiopauserender_fuzzer/BUILD.gn index 2768e936aa..3443d62ee6 100644 --- a/audio/test/fuzztest/hdi_fuzzer/control/audiopauserender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/control/audiopauserender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/control/audioresumecapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/control/audioresumecapture_fuzzer/BUILD.gn index 889bd7671a..7e286b5269 100644 --- a/audio/test/fuzztest/hdi_fuzzer/control/audioresumecapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/control/audioresumecapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/control/audioresumerender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/control/audioresumerender_fuzzer/BUILD.gn index 569fc2c8aa..8c89fef5f9 100644 --- a/audio/test/fuzztest/hdi_fuzzer/control/audioresumerender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/control/audioresumerender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/control/audiostartcapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/control/audiostartcapture_fuzzer/BUILD.gn index 07bc487a11..a2632f8714 100644 --- a/audio/test/fuzztest/hdi_fuzzer/control/audiostartcapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/control/audiostartcapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/control/audiostartrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/control/audiostartrender_fuzzer/BUILD.gn index 8acb499cd1..da73f9f785 100644 --- a/audio/test/fuzztest/hdi_fuzzer/control/audiostartrender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/control/audiostartrender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/control/audiostopcapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/control/audiostopcapture_fuzzer/BUILD.gn index 2f5f7b5a56..7dfa8f734e 100644 --- a/audio/test/fuzztest/hdi_fuzzer/control/audiostopcapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/control/audiostopcapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/control/audiostoprender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/control/audiostoprender_fuzzer/BUILD.gn index f166b34a85..f78b944ac2 100644 --- a/audio/test/fuzztest/hdi_fuzzer/control/audiostoprender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/control/audiostoprender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/render/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/BUILD.gn index f9f0bf9069..b4186f1dc0 100644 --- a/audio/test/fuzztest/hdi_fuzzer/render/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/render/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/test.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") group("render") { diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiogetchannelmoderender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiogetchannelmoderender_fuzzer/BUILD.gn index a5e6419f9c..4711d4042b 100644 --- a/audio/test/fuzztest/hdi_fuzzer/render/audiogetchannelmoderender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/render/audiogetchannelmoderender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiogetextraparamsrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiogetextraparamsrender_fuzzer/BUILD.gn index 2fc2f5bbd2..d3260c99f4 100644 --- a/audio/test/fuzztest/hdi_fuzzer/render/audiogetextraparamsrender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/render/audiogetextraparamsrender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiogetlatencyrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiogetlatencyrender_fuzzer/BUILD.gn index f899b3fbf0..21828c4009 100644 --- a/audio/test/fuzztest/hdi_fuzzer/render/audiogetlatencyrender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/render/audiogetlatencyrender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiogetrenderpositionrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiogetrenderpositionrender_fuzzer/BUILD.gn index 358408ddbe..d40bbb15e7 100644 --- a/audio/test/fuzztest/hdi_fuzzer/render/audiogetrenderpositionrender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/render/audiogetrenderpositionrender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiogetrenderspeedrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiogetrenderspeedrender_fuzzer/BUILD.gn index 924488472d..ed0c3b3c1a 100644 --- a/audio/test/fuzztest/hdi_fuzzer/render/audiogetrenderspeedrender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/render/audiogetrenderspeedrender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiorenderframerender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiorenderframerender_fuzzer/BUILD.gn index f8a179c0ef..8bb6001272 100644 --- a/audio/test/fuzztest/hdi_fuzzer/render/audiorenderframerender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/render/audiorenderframerender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiorenderframerequestbytes_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiorenderframerequestbytes_fuzzer/BUILD.gn index bbbc25aa7e..9e012379d3 100644 --- a/audio/test/fuzztest/hdi_fuzzer/render/audiorenderframerequestbytes_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/render/audiorenderframerequestbytes_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiosetchannelmoderender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiosetchannelmoderender_fuzzer/BUILD.gn index f0a622491b..34516e5105 100644 --- a/audio/test/fuzztest/hdi_fuzzer/render/audiosetchannelmoderender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/render/audiosetchannelmoderender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiosetextraparamsrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiosetextraparamsrender_fuzzer/BUILD.gn index c73b8fd2c8..1b31acf3e6 100644 --- a/audio/test/fuzztest/hdi_fuzzer/render/audiosetextraparamsrender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/render/audiosetextraparamsrender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiosetextraparamsrenderkeyvaluelist_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiosetextraparamsrenderkeyvaluelist_fuzzer/BUILD.gn index 3f12842a16..734fd18603 100644 --- a/audio/test/fuzztest/hdi_fuzzer/render/audiosetextraparamsrenderkeyvaluelist_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/render/audiosetextraparamsrenderkeyvaluelist_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiosetrenderspeedrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiosetrenderspeedrender_fuzzer/BUILD.gn index f840fb1a95..9bbd6cdf9b 100644 --- a/audio/test/fuzztest/hdi_fuzzer/render/audiosetrenderspeedrender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/render/audiosetrenderspeedrender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiosetrenderspeedspeed_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiosetrenderspeedspeed_fuzzer/BUILD.gn index e2ebfba351..08915e796e 100644 --- a/audio/test/fuzztest/hdi_fuzzer/render/audiosetrenderspeedspeed_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/render/audiosetrenderspeedspeed_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/BUILD.gn index fa65702988..8944cf6203 100644 --- a/audio/test/fuzztest/hdi_fuzzer/volume/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/volume/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/test.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") group("volume") { diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgaincapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgaincapture_fuzzer/BUILD.gn index e910dd4978..603adedb05 100644 --- a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgaincapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgaincapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainrender_fuzzer/BUILD.gn index 581910a6c3..c5dc281123 100644 --- a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainrender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainrender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainthresholdcapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainthresholdcapture_fuzzer/BUILD.gn index f70f51f514..88847abc9e 100644 --- a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainthresholdcapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainthresholdcapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainthresholdrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainthresholdrender_fuzzer/BUILD.gn index cbc59bcc37..9a85fb1806 100644 --- a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainthresholdrender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainthresholdrender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetmutecapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetmutecapture_fuzzer/BUILD.gn index 825e7f9e18..d94c91c90f 100644 --- a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetmutecapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetmutecapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetmuterender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetmuterender_fuzzer/BUILD.gn index 77580403e4..d5d7cd010b 100644 --- a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetmuterender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetmuterender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetvolumecapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetvolumecapture_fuzzer/BUILD.gn index ce516c4ea4..df80e718b8 100644 --- a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetvolumecapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetvolumecapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetvolumerender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetvolumerender_fuzzer/BUILD.gn index 4400196a5a..332743f91e 100644 --- a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetvolumerender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetvolumerender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgaincapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgaincapture_fuzzer/BUILD.gn index 63fda02ed8..ff8fc91789 100644 --- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgaincapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgaincapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgaincapturegain_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgaincapturegain_fuzzer/BUILD.gn index 65d1f2b8ad..fbd20e043e 100644 --- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgaincapturegain_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgaincapturegain_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgainrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgainrender_fuzzer/BUILD.gn index a37cc56af1..b92148d288 100644 --- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgainrender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgainrender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgainrendergain_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgainrendergain_fuzzer/BUILD.gn index d9f1b731e3..5c67107acd 100644 --- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgainrendergain_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgainrendergain_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmutecapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmutecapture_fuzzer/BUILD.gn index debc8ed234..2b5c7a99bc 100644 --- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmutecapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmutecapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmutecapturemute_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmutecapturemute_fuzzer/BUILD.gn index cc375fcbd8..c3f016329e 100644 --- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmutecapturemute_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmutecapturemute_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmuterender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmuterender_fuzzer/BUILD.gn index dd18c1685d..35ec22cd7d 100644 --- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmuterender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmuterender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmuterendermute_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmuterendermute_fuzzer/BUILD.gn index 5a494bf9d1..dcbe80bf9c 100644 --- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmuterendermute_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmuterendermute_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumecapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumecapture_fuzzer/BUILD.gn index 92fe81ab23..a3abf08ff2 100644 --- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumecapture_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumecapture_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumecapturevolume_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumecapturevolume_fuzzer/BUILD.gn index 34049b4378..e5c8f4436d 100644 --- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumecapturevolume_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumecapturevolume_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumerender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumerender_fuzzer/BUILD.gn index a49fbced66..f3cd4c3196 100644 --- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumerender_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumerender_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumerendervolume_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumerendervolume_fuzzer/BUILD.gn index 40efbf46c0..baaf2dc085 100644 --- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumerendervolume_fuzzer/BUILD.gn +++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumerendervolume_fuzzer/BUILD.gn @@ -13,7 +13,6 @@ import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//drivers/peripheral/audio/audio.gni") module_output_path = "hdf/audio" diff --git a/audio/test/sample/BUILD.gn b/audio/test/sample/BUILD.gn index 5c4f3083de..e439e0f364 100644 --- a/audio/test/sample/BUILD.gn +++ b/audio/test/sample/BUILD.gn @@ -15,7 +15,6 @@ hdf_audio_path = "./../.." import("//build/ohos.gni") import("//drivers/hdf_core/adapter/uhdf2/hdi.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("$hdf_audio_path/audio.gni") if (defined(ohos_lite)) { @@ -107,7 +106,7 @@ if (defined(ohos_lite)) { defines = [] - if (drivers_peripheral_audio_alsa_lib) { + if (drivers_peripheral_audio_feature_alsa_lib) { defines += [ "ALSA_LIB_MODE" ] } @@ -168,7 +167,7 @@ if (defined(ohos_lite)) { ] defines = [ "IDL_SAMPLE" ] - if (drivers_peripheral_audio_alsa_lib) { + if (drivers_peripheral_audio_feature_alsa_lib) { defines += [ "ALSA_LIB_MODE" ] } @@ -200,7 +199,7 @@ if (defined(ohos_lite)) { ] defines = [ "IDL_SAMPLE" ] - if (drivers_peripheral_audio_alsa_lib) { + if (drivers_peripheral_audio_feature_alsa_lib) { defines += [ "ALSA_LIB_MODE" ] } @@ -223,7 +222,7 @@ if (defined(ohos_lite)) { } group("audio_sample") { - if (drivers_peripheral_audio_hdf_proxy_stub == true) { + if (drivers_peripheral_audio_feature_hdf_proxy_stub == true) { deps = [ ":audio_sample_capture", ":audio_sample_render", @@ -233,7 +232,7 @@ group("audio_sample") { group("idl_audio_sample") { if (!defined(ohos_lite)) { - if (drivers_peripheral_audio_hdf_proxy_stub == true) { + if (drivers_peripheral_audio_feature_hdf_proxy_stub == true) { deps = [ ":idl_capture", ":idl_render", diff --git a/audio/test/systemtest/BUILD.gn b/audio/test/systemtest/BUILD.gn index 20432e119a..247467949a 100644 --- a/audio/test/systemtest/BUILD.gn +++ b/audio/test/systemtest/BUILD.gn @@ -30,10 +30,10 @@ if (defined(ohos_lite)) { group("systemtest") { testonly = true deps = [] - if (drivers_peripheral_audio_rich_device) { + if (drivers_peripheral_audio_feature_rich_device) { # deps += [ "hdi_advance:hdi_advance" ] } - if (drivers_peripheral_audio_full_test_suite) { + if (drivers_peripheral_audio_feature_full_test_suite) { deps += [ "hdi:hdi", "hdi_service:hdi_service_st", @@ -41,10 +41,10 @@ if (defined(ohos_lite)) { #"audio_adapter:audio_adapter", ] - if (!defined(drivers_peripheral_audio_alsa_lib) || - drivers_peripheral_audio_alsa_lib == false) { + if (!defined(drivers_peripheral_audio_feature_alsa_lib) || + drivers_peripheral_audio_feature_alsa_lib == false) { deps += [ - "adm:adm", + #"adm:adm", "audio_function:function", ] } diff --git a/audio/test/systemtest/README_zh.md b/audio/test/systemtest/README_zh.md index c601c4af3a..c9f0a13aa0 100644 --- a/audio/test/systemtest/README_zh.md +++ b/audio/test/systemtest/README_zh.md @@ -250,8 +250,8 @@ LIB层存在硬件耦合接口：为音量，增益，场景切换相关接口 "../../../common/hdi_common/src/audio_hdi_common.cpp", "../../../common/lib_common/src/audio_lib_common.cpp", ] - #drivers_peripheral_audio_alsa_lib - if(defined(drivers_peripheral_audio_alsa_lib) && drivers_peripheral_audio_alsa_lib == true) { + #drivers_peripheral_audio_feature_alsa_lib + if(defined(drivers_peripheral_audio_feature_alsa_lib) && drivers_peripheral_audio_feature_alsa_lib == true) { sources += ["src/audio_alsa_libcapture_test.cpp"] }else { sources += ["src/audio_libcapture_test.cpp"] @@ -332,7 +332,7 @@ LIB层存在硬件耦合接口：为音量，增益，场景切换相关接口 ````bash #gn内添加编译宏ALSA_LIB_MODE用于区分测试用例 - if(defined(drivers_peripheral_audio_alsa_lib) && drivers_peripheral_audio_alsa_lib == true) { + if(defined(drivers_peripheral_audio_feature_alsa_lib) && drivers_peripheral_audio_feature_alsa_lib == true) { defines += [ "ALSA_LIB_MODE" ] } #测试用例代码内使用示例 @@ -343,7 +343,7 @@ LIB层存在硬件耦合接口：为音量，增益，场景切换相关接口 EXPECT_EQ(AUDIO_HAL_ERR_INTERNAL, ret); #endif ```` -注：编译ALSA测试用例是需要设置ALSA编译选项，由drivers_peripheral_audio_alsa_lib编译选项控制，当"drivers_peripheral_audio_alsa_lib = true"表示编译ALSA模式测试用例，编译配置文件路径为./drivers/peripheral/audio/audio.gni文件内。 +注：编译ALSA测试用例是需要设置ALSA编译选项，由drivers_peripheral_audio_feature_alsa_lib编译选项控制，当"drivers_peripheral_audio_feature_alsa_lib = true"表示编译ALSA模式测试用例，编译配置文件路径为./drivers/peripheral/audio/audio.gni文件内。 ##### 1.2.3 录音阈值上报测试用例 码云上音频驱动模型默认不编译录音阈值上报功能代码，因此该功能对应的测试套（hdf_audio_threshold_report_test）默认不编译，如需编译需要手动修改gn文件，去掉“#”字符注释。gn文件路径为./audio_function/BUILD.gn diff --git a/audio/test/systemtest/adm/BUILD.gn b/audio/test/systemtest/adm/BUILD.gn index bc83ef3a66..b4fb5aafac 100644 --- a/audio/test/systemtest/adm/BUILD.gn +++ b/audio/test/systemtest/adm/BUILD.gn @@ -15,7 +15,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("./../../../audio.gni") } diff --git a/audio/test/systemtest/adm/audio_adm_interface/BUILD.gn b/audio/test/systemtest/adm/audio_adm_interface/BUILD.gn index 7b7ee874c6..10e4abc3ae 100644 --- a/audio/test/systemtest/adm/audio_adm_interface/BUILD.gn +++ b/audio/test/systemtest/adm/audio_adm_interface/BUILD.gn @@ -18,7 +18,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } import("$hdf_audio_path/audio.gni") @@ -82,8 +81,5 @@ if (defined(ohos_lite)) { if (enable_audio_adm_service) { defines += [ "AUDIO_ADM_SERVICE" ] } - if ("${product_name}" == "rk3568") { - defines += [ "PRODUCT_RK3568" ] - } } } diff --git a/audio/test/systemtest/audio_adapter/BUILD.gn b/audio/test/systemtest/audio_adapter/BUILD.gn index bf921ffad9..9d42a35173 100644 --- a/audio/test/systemtest/audio_adapter/BUILD.gn +++ b/audio/test/systemtest/audio_adapter/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("./../../../audio.gni") ###########################end########################### diff --git a/audio/test/systemtest/audio_adapter/audio_usb/BUILD.gn b/audio/test/systemtest/audio_adapter/audio_usb/BUILD.gn index 880ad904bf..78f16cf421 100644 --- a/audio/test/systemtest/audio_adapter/audio_usb/BUILD.gn +++ b/audio/test/systemtest/audio_adapter/audio_usb/BUILD.gn @@ -15,7 +15,7 @@ hdf_audio_path = "./../../../.." hdf_audio_test_path = "./../.." import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") + import("$hdf_audio_path/audio.gni") module_output_path = "drivers_peripheral_audio/audio" @@ -50,7 +50,7 @@ ohos_systemtest("hdf_audio_usb_adapter_test") { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } diff --git a/audio/test/systemtest/audio_function/BUILD.gn b/audio/test/systemtest/audio_function/BUILD.gn index 4ebb87e206..ae8d57857b 100644 --- a/audio/test/systemtest/audio_function/BUILD.gn +++ b/audio/test/systemtest/audio_function/BUILD.gn @@ -15,7 +15,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("./../../../audio.gni") } @@ -29,18 +28,5 @@ group("function") { "audio_pathroute:hdf_audio_hdi_path_route_test", "audio_smartpa:hdf_audio_smartpa_test", ] - } else { - #deps += [ "audio_threshold_report:hdf_audio_threshold_report_test" ] - if ("${product_name}" == "hispark_taurus_standard") { - if (enable_audio_adm_passthrough) { - deps += [ - "audio_pathroute:hdf_audio_hdi_path_route_test", - "audio_smartpa:hdf_audio_smartpa_test", - ] - } - if (enable_audio_adm_service) { - deps += [ "audio_smartpa:hdf_audio_smartpa_test" ] - } - } } } diff --git a/audio/test/systemtest/audio_function/audio_pathroute/BUILD.gn b/audio/test/systemtest/audio_function/audio_pathroute/BUILD.gn index bad2466c74..2d3c399973 100644 --- a/audio/test/systemtest/audio_function/audio_pathroute/BUILD.gn +++ b/audio/test/systemtest/audio_function/audio_pathroute/BUILD.gn @@ -18,7 +18,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } import("$hdf_audio_path/audio.gni") @@ -45,7 +44,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", "//third_party/bounds_checking_function:libsec_shared", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -84,7 +83,7 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } diff --git a/audio/test/systemtest/audio_function/audio_server/BUILD.gn b/audio/test/systemtest/audio_function/audio_server/BUILD.gn index 0b401d6224..98841cbdca 100644 --- a/audio/test/systemtest/audio_function/audio_server/BUILD.gn +++ b/audio/test/systemtest/audio_function/audio_server/BUILD.gn @@ -18,7 +18,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } import("$hdf_audio_path/audio.gni") @@ -42,7 +41,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/manager:hdf_core", "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -83,7 +82,7 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } diff --git a/audio/test/systemtest/audio_function/audio_smartpa/BUILD.gn b/audio/test/systemtest/audio_function/audio_smartpa/BUILD.gn index aa5d62160e..11b16247ef 100644 --- a/audio/test/systemtest/audio_function/audio_smartpa/BUILD.gn +++ b/audio/test/systemtest/audio_function/audio_smartpa/BUILD.gn @@ -18,7 +18,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } import("$hdf_audio_path/audio.gni") @@ -53,7 +52,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", "//third_party/bounds_checking_function:libsec_shared", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -105,7 +104,7 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } diff --git a/audio/test/systemtest/audio_function/audio_threshold_report/BUILD.gn b/audio/test/systemtest/audio_function/audio_threshold_report/BUILD.gn index 646082e489..b1b5eb93ad 100644 --- a/audio/test/systemtest/audio_function/audio_threshold_report/BUILD.gn +++ b/audio/test/systemtest/audio_function/audio_threshold_report/BUILD.gn @@ -16,7 +16,6 @@ hdf_audio_test_path = "./../.." if (!defined(ohos_lite)) { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } import("$hdf_audio_path/audio.gni") if (!defined(ohos_lite)) { @@ -61,7 +60,7 @@ if (!defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } diff --git a/audio/test/systemtest/hdi/BUILD.gn b/audio/test/systemtest/hdi/BUILD.gn index f0dd9b157e..42e42811d3 100644 --- a/audio/test/systemtest/hdi/BUILD.gn +++ b/audio/test/systemtest/hdi/BUILD.gn @@ -15,7 +15,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("./../../../audio.gni") } @@ -25,10 +24,10 @@ group("hdi") { } deps = [ "common:hdi_common", - "hardwaredependence:hdi_hardwaredependence", + #"hardwaredependence:hdi_hardwaredependence", ] - if (!defined(drivers_peripheral_audio_alsa_lib) || - drivers_peripheral_audio_alsa_lib == false) { + if (!defined(drivers_peripheral_audio_feature_alsa_lib) || + drivers_peripheral_audio_feature_alsa_lib == false) { deps += [ "hdiperformace:hdi_performace" ] if (!defined(ohos_lite)) { if (enable_audio_adm_service) { diff --git a/audio/test/systemtest/hdi/common/BUILD.gn b/audio/test/systemtest/hdi/common/BUILD.gn index 43aa9e5c73..0774e1862e 100644 --- a/audio/test/systemtest/hdi/common/BUILD.gn +++ b/audio/test/systemtest/hdi/common/BUILD.gn @@ -15,7 +15,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("./../../../../audio.gni") } diff --git a/audio/test/systemtest/hdi/common/adapter/BUILD.gn b/audio/test/systemtest/hdi/common/adapter/BUILD.gn index 2d388bfd7a..bcdc2bf3f6 100644 --- a/audio/test/systemtest/hdi/common/adapter/BUILD.gn +++ b/audio/test/systemtest/hdi/common/adapter/BUILD.gn @@ -18,7 +18,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } import("$hdf_audio_path/audio.gni") @@ -42,7 +41,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/manager:hdf_core", "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -79,7 +78,7 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } diff --git a/audio/test/systemtest/hdi/common/capture/BUILD.gn b/audio/test/systemtest/hdi/common/capture/BUILD.gn index a3718b7242..a3b8230435 100644 --- a/audio/test/systemtest/hdi/common/capture/BUILD.gn +++ b/audio/test/systemtest/hdi/common/capture/BUILD.gn @@ -18,7 +18,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } import("$hdf_audio_path/audio.gni") @@ -42,7 +41,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/manager:hdf_core", "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -65,7 +64,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/manager:hdf_core", "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -88,7 +87,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/manager:hdf_core", "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -111,7 +110,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/manager:hdf_core", "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -134,7 +133,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/manager:hdf_core", "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -171,11 +170,11 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if (defined(drivers_peripheral_audio_alsa_lib) && - drivers_peripheral_audio_alsa_lib == true) { + if (defined(drivers_peripheral_audio_feature_alsa_lib) && + drivers_peripheral_audio_feature_alsa_lib == true) { defines += [ "ALSA_LIB_MODE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } @@ -209,11 +208,11 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if (defined(drivers_peripheral_audio_alsa_lib) && - drivers_peripheral_audio_alsa_lib == true) { + if (defined(drivers_peripheral_audio_feature_alsa_lib) && + drivers_peripheral_audio_feature_alsa_lib == true) { defines += [ "ALSA_LIB_MODE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } @@ -247,11 +246,11 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if (defined(drivers_peripheral_audio_alsa_lib) && - drivers_peripheral_audio_alsa_lib == true) { + if (defined(drivers_peripheral_audio_feature_alsa_lib) && + drivers_peripheral_audio_feature_alsa_lib == true) { defines += [ "ALSA_LIB_MODE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } @@ -285,11 +284,11 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if (defined(drivers_peripheral_audio_alsa_lib) && - drivers_peripheral_audio_alsa_lib == true) { + if (defined(drivers_peripheral_audio_feature_alsa_lib) && + drivers_peripheral_audio_feature_alsa_lib == true) { defines += [ "ALSA_LIB_MODE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } @@ -323,7 +322,7 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } diff --git a/audio/test/systemtest/hdi/common/manager/BUILD.gn b/audio/test/systemtest/hdi/common/manager/BUILD.gn index fc6865eb1e..5e693c1739 100644 --- a/audio/test/systemtest/hdi/common/manager/BUILD.gn +++ b/audio/test/systemtest/hdi/common/manager/BUILD.gn @@ -18,7 +18,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } import("$hdf_audio_path/audio.gni") @@ -42,7 +41,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/manager:hdf_core", "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -80,7 +79,7 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } diff --git a/audio/test/systemtest/hdi/common/render/BUILD.gn b/audio/test/systemtest/hdi/common/render/BUILD.gn index 09dd538395..b9cc74a9a8 100644 --- a/audio/test/systemtest/hdi/common/render/BUILD.gn +++ b/audio/test/systemtest/hdi/common/render/BUILD.gn @@ -18,7 +18,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } import("$hdf_audio_path/audio.gni") @@ -42,7 +41,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/manager:hdf_core", "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -66,7 +65,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/manager:hdf_core", "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -89,7 +88,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/manager:hdf_core", "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -113,7 +112,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/manager:hdf_core", "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -136,7 +135,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/manager:hdf_core", "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -174,7 +173,7 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } @@ -210,7 +209,7 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } @@ -246,14 +245,11 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if ("${product_name}" == "rk3568") { - defines += [ "PRODUCT_RK3568" ] - } - if (defined(drivers_peripheral_audio_alsa_lib) && - drivers_peripheral_audio_alsa_lib == true) { + if (defined(drivers_peripheral_audio_feature_alsa_lib) && + drivers_peripheral_audio_feature_alsa_lib == true) { defines += [ "ALSA_LIB_MODE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } @@ -289,11 +285,11 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if (defined(drivers_peripheral_audio_alsa_lib) && - drivers_peripheral_audio_alsa_lib == true) { + if (defined(drivers_peripheral_audio_feature_alsa_lib) && + drivers_peripheral_audio_feature_alsa_lib == true) { defines += [ "ALSA_LIB_MODE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } @@ -329,14 +325,11 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if ("${product_name}" == "rk3568") { - defines += [ "PRODUCT_RK3568" ] - } - if (defined(drivers_peripheral_audio_alsa_lib) && - drivers_peripheral_audio_alsa_lib == true) { + if (defined(drivers_peripheral_audio_feature_alsa_lib) && + drivers_peripheral_audio_feature_alsa_lib == true) { defines += [ "ALSA_LIB_MODE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } diff --git a/audio/test/systemtest/hdi/hardwaredependence/BUILD.gn b/audio/test/systemtest/hdi/hardwaredependence/BUILD.gn index 5c9368a034..7d0fab8867 100644 --- a/audio/test/systemtest/hdi/hardwaredependence/BUILD.gn +++ b/audio/test/systemtest/hdi/hardwaredependence/BUILD.gn @@ -15,7 +15,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("./../../../../audio.gni") } diff --git a/audio/test/systemtest/hdi/hardwaredependence/capture/BUILD.gn b/audio/test/systemtest/hdi/hardwaredependence/capture/BUILD.gn index 9f75730b02..14f1a298f6 100644 --- a/audio/test/systemtest/hdi/hardwaredependence/capture/BUILD.gn +++ b/audio/test/systemtest/hdi/hardwaredependence/capture/BUILD.gn @@ -18,7 +18,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } import("$hdf_audio_path/audio.gni") @@ -41,7 +40,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/manager:hdf_core", "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -77,14 +76,11 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if ("${product_name}" == "rk3568") { - defines += [ "PRODUCT_RK3568" ] - } - if (defined(drivers_peripheral_audio_alsa_lib) && - drivers_peripheral_audio_alsa_lib == true) { + if (defined(drivers_peripheral_audio_feature_alsa_lib) && + drivers_peripheral_audio_feature_alsa_lib == true) { defines += [ "ALSA_LIB_MODE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } diff --git a/audio/test/systemtest/hdi/hardwaredependence/render/BUILD.gn b/audio/test/systemtest/hdi/hardwaredependence/render/BUILD.gn index 72ae39ddfa..1653e75621 100644 --- a/audio/test/systemtest/hdi/hardwaredependence/render/BUILD.gn +++ b/audio/test/systemtest/hdi/hardwaredependence/render/BUILD.gn @@ -18,7 +18,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } import("$hdf_audio_path/audio.gni") @@ -42,7 +41,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/manager:hdf_core", "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -79,14 +78,11 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if ("${product_name}" == "rk3568") { - defines += [ "PRODUCT_RK3568" ] - } - if (defined(drivers_peripheral_audio_alsa_lib) && - drivers_peripheral_audio_alsa_lib == true) { + if (defined(drivers_peripheral_audio_feature_alsa_lib) && + drivers_peripheral_audio_feature_alsa_lib == true) { defines += [ "ALSA_LIB_MODE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } diff --git a/audio/test/systemtest/hdi/hdiperformace/BUILD.gn b/audio/test/systemtest/hdi/hdiperformace/BUILD.gn index 6c6b1dba04..dc2b72d0e7 100644 --- a/audio/test/systemtest/hdi/hdiperformace/BUILD.gn +++ b/audio/test/systemtest/hdi/hdiperformace/BUILD.gn @@ -18,7 +18,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } import("$hdf_audio_path/audio.gni") @@ -42,7 +41,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/manager:hdf_core", "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -66,7 +65,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/manager:hdf_core", "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -104,7 +103,7 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } @@ -139,7 +138,7 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } diff --git a/audio/test/systemtest/hdi/hdireliability/BUILD.gn b/audio/test/systemtest/hdi/hdireliability/BUILD.gn index 2b1eb28885..a888b266a0 100644 --- a/audio/test/systemtest/hdi/hdireliability/BUILD.gn +++ b/audio/test/systemtest/hdi/hdireliability/BUILD.gn @@ -18,7 +18,7 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") + import("$hdf_audio_path/audio.gni") } @@ -44,7 +44,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", "//third_party/bounds_checking_function:libsec_shared", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -69,7 +69,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", "//third_party/bounds_checking_function:libsec_shared", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -95,7 +95,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", "//third_party/bounds_checking_function:libsec_shared", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -121,7 +121,7 @@ if (defined(ohos_lite)) { "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", "//third_party/bounds_checking_function:libsec_shared", ] - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines = [ "FEATURE_SMALL_DEVICE" ] } } @@ -161,7 +161,7 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } @@ -198,7 +198,7 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } @@ -235,7 +235,7 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } @@ -273,7 +273,7 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if (!drivers_peripheral_audio_rich_device) { + if (!drivers_peripheral_audio_feature_rich_device) { defines += [ "FEATURE_SMALL_DEVICE" ] } } diff --git a/audio/test/systemtest/hdi_advance/BUILD.gn b/audio/test/systemtest/hdi_advance/BUILD.gn index cf1a7ef915..ddf96c4e14 100644 --- a/audio/test/systemtest/hdi_advance/BUILD.gn +++ b/audio/test/systemtest/hdi_advance/BUILD.gn @@ -15,7 +15,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("./../../../audio.gni") } diff --git a/audio/test/systemtest/hdi_advance/common/BUILD.gn b/audio/test/systemtest/hdi_advance/common/BUILD.gn index 22ccc43216..d6b3e8d0f4 100644 --- a/audio/test/systemtest/hdi_advance/common/BUILD.gn +++ b/audio/test/systemtest/hdi_advance/common/BUILD.gn @@ -15,7 +15,7 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") + import("./../../../../audio.gni") } diff --git a/audio/test/systemtest/hdi_advance/common/adapter/BUILD.gn b/audio/test/systemtest/hdi_advance/common/adapter/BUILD.gn index 61568166ef..2edbdf60e1 100644 --- a/audio/test/systemtest/hdi_advance/common/adapter/BUILD.gn +++ b/audio/test/systemtest/hdi_advance/common/adapter/BUILD.gn @@ -18,7 +18,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } import("$hdf_audio_path/audio.gni") diff --git a/audio/test/systemtest/hdi_advance/common/capture/BUILD.gn b/audio/test/systemtest/hdi_advance/common/capture/BUILD.gn index 6d3f4c9481..22c81511c7 100644 --- a/audio/test/systemtest/hdi_advance/common/capture/BUILD.gn +++ b/audio/test/systemtest/hdi_advance/common/capture/BUILD.gn @@ -18,7 +18,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } import("$hdf_audio_path/audio.gni") diff --git a/audio/test/systemtest/hdi_advance/common/manager/BUILD.gn b/audio/test/systemtest/hdi_advance/common/manager/BUILD.gn index 36e18fdd4a..80bde5eb75 100644 --- a/audio/test/systemtest/hdi_advance/common/manager/BUILD.gn +++ b/audio/test/systemtest/hdi_advance/common/manager/BUILD.gn @@ -18,7 +18,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } import("$hdf_audio_path/audio.gni") diff --git a/audio/test/systemtest/hdi_advance/common/render/BUILD.gn b/audio/test/systemtest/hdi_advance/common/render/BUILD.gn index 7c75c7dbe4..4b74418a51 100644 --- a/audio/test/systemtest/hdi_advance/common/render/BUILD.gn +++ b/audio/test/systemtest/hdi_advance/common/render/BUILD.gn @@ -18,7 +18,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } import("$hdf_audio_path/audio.gni") @@ -188,8 +187,5 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if ("${product_name}" == "rk3568") { - defines += [ "PRODUCT_RK3568" ] - } } } diff --git a/audio/test/systemtest/hdi_advance/hardwaredependence/BUILD.gn b/audio/test/systemtest/hdi_advance/hardwaredependence/BUILD.gn index 617e381197..9288e4ad32 100644 --- a/audio/test/systemtest/hdi_advance/hardwaredependence/BUILD.gn +++ b/audio/test/systemtest/hdi_advance/hardwaredependence/BUILD.gn @@ -15,7 +15,7 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") + import("./../../../../audio.gni") } diff --git a/audio/test/systemtest/hdi_advance/hardwaredependence/capture/BUILD.gn b/audio/test/systemtest/hdi_advance/hardwaredependence/capture/BUILD.gn index 8ca28e6384..bb956d75e9 100644 --- a/audio/test/systemtest/hdi_advance/hardwaredependence/capture/BUILD.gn +++ b/audio/test/systemtest/hdi_advance/hardwaredependence/capture/BUILD.gn @@ -18,7 +18,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } import("$hdf_audio_path/audio.gni") @@ -74,8 +73,5 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if ("${product_name}" == "rk3568") { - defines += [ "PRODUCT_RK3568" ] - } } } diff --git a/audio/test/systemtest/hdi_advance/hardwaredependence/render/BUILD.gn b/audio/test/systemtest/hdi_advance/hardwaredependence/render/BUILD.gn index 082f0c6da0..d08a938bc4 100644 --- a/audio/test/systemtest/hdi_advance/hardwaredependence/render/BUILD.gn +++ b/audio/test/systemtest/hdi_advance/hardwaredependence/render/BUILD.gn @@ -18,7 +18,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } import("$hdf_audio_path/audio.gni") @@ -76,8 +75,5 @@ if (defined(ohos_lite)) { deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ] defines += [ "AUDIO_ADM_SERVICE" ] } - if ("${product_name}" == "rk3568") { - defines += [ "PRODUCT_RK3568" ] - } } } diff --git a/audio/test/systemtest/hdi_service/BUILD.gn b/audio/test/systemtest/hdi_service/BUILD.gn index 70629fdfb6..efe012013c 100644 --- a/audio/test/systemtest/hdi_service/BUILD.gn +++ b/audio/test/systemtest/hdi_service/BUILD.gn @@ -18,13 +18,7 @@ import("./../../../audio.gni") group("hdi_service_st") { testonly = true deps = [ "common:hdi_service_common" ] - if ("${product_name}" == "hispark_taurus_standard") { - deps += [ "hispark_taurus_standard:hdi_service_hardwaredependence" ] - } - if ("${product_name}" == "rk3568") { - deps += [ "rk3568:hdi_service_hardwaredependence" ] - } - if (drivers_peripheral_audio_alsa_lib == false) { + if (drivers_peripheral_audio_feature_alsa_lib == false) { deps += [ "hdiperformace:hdf_audio_idlhdi_performace_test" ] } } diff --git a/audio/test/systemtest/hdi_service/common/BUILD.gn b/audio/test/systemtest/hdi_service/common/BUILD.gn index 73480b89f2..e0cb1e283e 100644 --- a/audio/test/systemtest/hdi_service/common/BUILD.gn +++ b/audio/test/systemtest/hdi_service/common/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") + import("./../../../../audio.gni") group("hdi_service_common") { diff --git a/audio/test/systemtest/hdi_service/common/capture/BUILD.gn b/audio/test/systemtest/hdi_service/common/capture/BUILD.gn index 616b97411c..34b8c10ca5 100644 --- a/audio/test/systemtest/hdi_service/common/capture/BUILD.gn +++ b/audio/test/systemtest/hdi_service/common/capture/BUILD.gn @@ -50,7 +50,7 @@ if (!defined(ohos_lite)) { if (enable_audio_adm_service) { defines += [ "AUDIO_ADM_SERVICE" ] } - if (drivers_peripheral_audio_alsa_lib == true) { + if (drivers_peripheral_audio_feature_alsa_lib == true) { defines += [ "ALSA_LIB_MODE" ] } } diff --git a/audio/test/systemtest/hdi_service/common/render/BUILD.gn b/audio/test/systemtest/hdi_service/common/render/BUILD.gn index 902b5e88a5..7cc80f87bf 100644 --- a/audio/test/systemtest/hdi_service/common/render/BUILD.gn +++ b/audio/test/systemtest/hdi_service/common/render/BUILD.gn @@ -49,7 +49,7 @@ ohos_systemtest("hdf_audio_idlhdi_render_test") { if (enable_audio_adm_service) { defines += [ "AUDIO_ADM_SERVICE" ] } - if (drivers_peripheral_audio_alsa_lib == true) { + if (drivers_peripheral_audio_feature_alsa_lib == true) { defines += [ "ALSA_LIB_MODE" ] } } diff --git a/audio/test/systemtest/hdi_service/hispark_taurus_standard/BUILD.gn b/audio/test/systemtest/hdi_service/hispark_taurus_standard/BUILD.gn index 0bcedf79aa..bee2329df0 100644 --- a/audio/test/systemtest/hdi_service/hispark_taurus_standard/BUILD.gn +++ b/audio/test/systemtest/hdi_service/hispark_taurus_standard/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") + import("./../../../../audio.gni") group("hdi_service_hardwaredependence") { diff --git a/audio/test/systemtest/hdi_service/hispark_taurus_standard/capture/BUILD.gn b/audio/test/systemtest/hdi_service/hispark_taurus_standard/capture/BUILD.gn index 7cd6a08491..de1ed0ae16 100644 --- a/audio/test/systemtest/hdi_service/hispark_taurus_standard/capture/BUILD.gn +++ b/audio/test/systemtest/hdi_service/hispark_taurus_standard/capture/BUILD.gn @@ -44,7 +44,7 @@ ohos_systemtest("hdf_audio_idlhdi_capture_hardware_dependence_test") { defines += [ "AUDIO_ADM_SERVICE" ] } - if (drivers_peripheral_audio_alsa_lib) { + if (drivers_peripheral_audio_feature_alsa_lib) { defines += [ "ALSA_LIB_MODE" ] } } diff --git a/audio/test/systemtest/hdi_service/hispark_taurus_standard/render/BUILD.gn b/audio/test/systemtest/hdi_service/hispark_taurus_standard/render/BUILD.gn index 42c9a11640..39b7910220 100644 --- a/audio/test/systemtest/hdi_service/hispark_taurus_standard/render/BUILD.gn +++ b/audio/test/systemtest/hdi_service/hispark_taurus_standard/render/BUILD.gn @@ -45,7 +45,7 @@ ohos_systemtest("hdf_audio_idlhdi_render_hardware_dependence_test") { if (enable_audio_adm_service) { defines += [ "AUDIO_ADM_SERVICE" ] } - if (drivers_peripheral_audio_alsa_lib) { + if (drivers_peripheral_audio_feature_alsa_lib) { defines += [ "ALSA_LIB_MODE" ] } } diff --git a/audio/test/systemtest/hdi_service/rk3568/BUILD.gn b/audio/test/systemtest/hdi_service/rk3568/BUILD.gn index 0bcedf79aa..9c8e9aeb4c 100644 --- a/audio/test/systemtest/hdi_service/rk3568/BUILD.gn +++ b/audio/test/systemtest/hdi_service/rk3568/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("./../../../../audio.gni") group("hdi_service_hardwaredependence") { diff --git a/audio/test/systemtest/hdi_service/rk3568/capture/BUILD.gn b/audio/test/systemtest/hdi_service/rk3568/capture/BUILD.gn index 4c4fabe8c4..c4e39d25da 100644 --- a/audio/test/systemtest/hdi_service/rk3568/capture/BUILD.gn +++ b/audio/test/systemtest/hdi_service/rk3568/capture/BUILD.gn @@ -43,7 +43,7 @@ ohos_systemtest("hdf_audio_idlhdi_capture_hardware_dependence_test") { defines += [ "AUDIO_ADM_SERVICE" ] } - if (drivers_peripheral_audio_alsa_lib) { + if (drivers_peripheral_audio_feature_alsa_lib) { defines += [ "ALSA_LIB_MODE" ] } } diff --git a/audio/test/systemtest/hdi_service/rk3568/render/BUILD.gn b/audio/test/systemtest/hdi_service/rk3568/render/BUILD.gn index 2b8bd09f8d..c00bf00b86 100644 --- a/audio/test/systemtest/hdi_service/rk3568/render/BUILD.gn +++ b/audio/test/systemtest/hdi_service/rk3568/render/BUILD.gn @@ -43,7 +43,7 @@ ohos_systemtest("hdf_audio_idlhdi_render_hardware_dependence_test") { if (enable_audio_adm_service) { defines += [ "AUDIO_ADM_SERVICE" ] } - if (drivers_peripheral_audio_alsa_lib) { + if (drivers_peripheral_audio_feature_alsa_lib) { defines += [ "ALSA_LIB_MODE" ] } } diff --git a/audio/test/systemtest/supportlibs/BUILD.gn b/audio/test/systemtest/supportlibs/BUILD.gn index 2900c9d637..341894094d 100644 --- a/audio/test/systemtest/supportlibs/BUILD.gn +++ b/audio/test/systemtest/supportlibs/BUILD.gn @@ -15,7 +15,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("./../../../audio.gni") } @@ -25,8 +24,8 @@ group("supportlibs") { testonly = true if (enable_audio_adm_passthrough) { deps += [ "common:lib_common" ] - if (!defined(drivers_peripheral_audio_alsa_lib) || - drivers_peripheral_audio_alsa_lib == false) { + if (!defined(drivers_peripheral_audio_feature_alsa_lib) || + drivers_peripheral_audio_feature_alsa_lib == false) { deps += [ "hardwaredependence:lib_hardwaredependence" ] } } diff --git a/audio/test/systemtest/supportlibs/common/BUILD.gn b/audio/test/systemtest/supportlibs/common/BUILD.gn index fe83ebacf4..d9c88cf231 100644 --- a/audio/test/systemtest/supportlibs/common/BUILD.gn +++ b/audio/test/systemtest/supportlibs/common/BUILD.gn @@ -15,7 +15,7 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") + import("./../../../../audio.gni") } diff --git a/audio/test/systemtest/supportlibs/common/capture/BUILD.gn b/audio/test/systemtest/supportlibs/common/capture/BUILD.gn index bc8bbdd575..8c07717a55 100644 --- a/audio/test/systemtest/supportlibs/common/capture/BUILD.gn +++ b/audio/test/systemtest/supportlibs/common/capture/BUILD.gn @@ -18,7 +18,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } import("$hdf_audio_path/audio.gni") @@ -61,8 +60,8 @@ if (defined(ohos_lite)) { "$hdf_audio_test_path/common/hdi_common/src/audio_hdi_common.cpp", "$hdf_audio_test_path/common/lib_common/src/audio_lib_common.cpp", ] - if (defined(drivers_peripheral_audio_alsa_lib) && - drivers_peripheral_audio_alsa_lib == true) { + if (defined(drivers_peripheral_audio_feature_alsa_lib) && + drivers_peripheral_audio_feature_alsa_lib == true) { sources += [ "src/audio_alsa_libcapture_test.cpp" ] } else { sources += [ "src/audio_libcapture_test.cpp" ] diff --git a/audio/test/systemtest/supportlibs/common/render/BUILD.gn b/audio/test/systemtest/supportlibs/common/render/BUILD.gn index 23030c018b..83fea3512e 100644 --- a/audio/test/systemtest/supportlibs/common/render/BUILD.gn +++ b/audio/test/systemtest/supportlibs/common/render/BUILD.gn @@ -18,7 +18,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } import("$hdf_audio_path/audio.gni") @@ -63,8 +62,8 @@ if (defined(ohos_lite)) { "$hdf_audio_test_path/common/hdi_common/src/audio_hdi_common.cpp", "$hdf_audio_test_path/common/lib_common/src/audio_lib_common.cpp", ] - if (defined(drivers_peripheral_audio_alsa_lib) && - drivers_peripheral_audio_alsa_lib == true) { + if (defined(drivers_peripheral_audio_feature_alsa_lib) && + drivers_peripheral_audio_feature_alsa_lib == true) { sources += [ "src/audio_alsa_librender_test.cpp" ] } else { sources += [ "src/audio_librender_test.cpp" ] diff --git a/audio/test/systemtest/supportlibs/hardwaredependence/BUILD.gn b/audio/test/systemtest/supportlibs/hardwaredependence/BUILD.gn index 0d84d453b9..810c9db708 100644 --- a/audio/test/systemtest/supportlibs/hardwaredependence/BUILD.gn +++ b/audio/test/systemtest/supportlibs/hardwaredependence/BUILD.gn @@ -15,7 +15,7 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") + import("./../../../../audio.gni") } diff --git a/audio/test/systemtest/supportlibs/hardwaredependence/capture/BUILD.gn b/audio/test/systemtest/supportlibs/hardwaredependence/capture/BUILD.gn index df6c90fa98..babdb6dec7 100644 --- a/audio/test/systemtest/supportlibs/hardwaredependence/capture/BUILD.gn +++ b/audio/test/systemtest/supportlibs/hardwaredependence/capture/BUILD.gn @@ -18,7 +18,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } import("$hdf_audio_path/audio.gni") @@ -90,8 +89,5 @@ if (defined(ohos_lite)) { if (enable_audio_adm_service) { defines += [ "AUDIO_ADM_SERVICE" ] } - if ("${product_name}" == "rk3568") { - defines += [ "PRODUCT_RK3568" ] - } } } diff --git a/audio/test/systemtest/supportlibs/hardwaredependence/render/BUILD.gn b/audio/test/systemtest/supportlibs/hardwaredependence/render/BUILD.gn index 3c4267d8bf..e5cfe9d33b 100644 --- a/audio/test/systemtest/supportlibs/hardwaredependence/render/BUILD.gn +++ b/audio/test/systemtest/supportlibs/hardwaredependence/render/BUILD.gn @@ -18,7 +18,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } import("$hdf_audio_path/audio.gni") @@ -92,8 +91,5 @@ if (defined(ohos_lite)) { if (enable_audio_adm_service) { defines += [ "AUDIO_ADM_SERVICE" ] } - if ("${product_name}" == "rk3568") { - defines += [ "PRODUCT_RK3568" ] - } } } diff --git a/audio/test/unittest/BUILD.gn b/audio/test/unittest/BUILD.gn index d4a32e24ea..88e14d1cd2 100644 --- a/audio/test/unittest/BUILD.gn +++ b/audio/test/unittest/BUILD.gn @@ -16,7 +16,6 @@ if (defined(ohos_lite)) { import("//build/lite/config/test.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") } group("audiotest") { @@ -26,10 +25,10 @@ group("audiotest") { deps = [ "common:hdi_base_common" ] # hal ut - if (drivers_peripheral_audio_rich_device) { + if (drivers_peripheral_audio_feature_rich_device) { # deps += [ "hdi/client_advance:hdi_client_advance" ] } - if (drivers_peripheral_audio_full_test_suite) { + if (drivers_peripheral_audio_feature_full_test_suite) { deps += [ "hdi/client:hdi_client", "hdi/passthrough:hdi_passthrough", diff --git a/audio/test/unittest/common/BUILD.gn b/audio/test/unittest/common/BUILD.gn index e4735cf74e..9884849b27 100644 --- a/audio/test/unittest/common/BUILD.gn +++ b/audio/test/unittest/common/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("./../../../audio.gni") ohos_unittest("audio_ut_common_test") { diff --git a/audio/test/unittest/hdi/client/BUILD.gn b/audio/test/unittest/hdi/client/BUILD.gn index 2a88208842..5fefa20ff7 100644 --- a/audio/test/unittest/hdi/client/BUILD.gn +++ b/audio/test/unittest/hdi/client/BUILD.gn @@ -12,11 +12,10 @@ # limitations under the License. import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("./../../../../audio.gni") group("hdi_client") { - if (!defined(ohos_lite) && !drivers_peripheral_audio_user_mode) { + if (!defined(ohos_lite) && !drivers_peripheral_audio_feature_user_mode) { testonly = true deps = [ # "adapter:hdf_audio_proxy_adapter_test", diff --git a/audio/test/unittest/hdi/client/adapter/BUILD.gn b/audio/test/unittest/hdi/client/adapter/BUILD.gn index 7255226883..6b77267f37 100644 --- a/audio/test/unittest/hdi/client/adapter/BUILD.gn +++ b/audio/test/unittest/hdi/client/adapter/BUILD.gn @@ -15,7 +15,6 @@ hdf_audio_path = "./../../../../.." hdf_audio_test_path = "./.." import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("$hdf_audio_path/audio.gni") ohos_unittest("hdf_audio_proxy_adapter_test") { diff --git a/audio/test/unittest/hdi/client/capture/BUILD.gn b/audio/test/unittest/hdi/client/capture/BUILD.gn index 94f48075b4..6a61b012a8 100644 --- a/audio/test/unittest/hdi/client/capture/BUILD.gn +++ b/audio/test/unittest/hdi/client/capture/BUILD.gn @@ -15,7 +15,6 @@ hdf_audio_path = "./../../../../.." hdf_audio_test_path = "./.." import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("$hdf_audio_path/audio.gni") ohos_unittest("hdf_audio_proxy_capture_test") { diff --git a/audio/test/unittest/hdi/client/common/BUILD.gn b/audio/test/unittest/hdi/client/common/BUILD.gn index 5553640002..7fb0d8569b 100644 --- a/audio/test/unittest/hdi/client/common/BUILD.gn +++ b/audio/test/unittest/hdi/client/common/BUILD.gn @@ -14,7 +14,6 @@ hdf_audio_path = "./../../../../.." import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("$hdf_audio_path/audio.gni") ohos_unittest("hdf_audio_proxy_common_test") { diff --git a/audio/test/unittest/hdi/client/manager/BUILD.gn b/audio/test/unittest/hdi/client/manager/BUILD.gn index f475dd0369..97f1c09c45 100644 --- a/audio/test/unittest/hdi/client/manager/BUILD.gn +++ b/audio/test/unittest/hdi/client/manager/BUILD.gn @@ -15,7 +15,6 @@ hdf_audio_path = "./../../../../.." hdf_audio_test_path = "./.." import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("$hdf_audio_path/audio.gni") ohos_unittest("hdf_audio_proxy_manager_test") { diff --git a/audio/test/unittest/hdi/client/render/BUILD.gn b/audio/test/unittest/hdi/client/render/BUILD.gn index 37f0d706fd..9c863eb1ad 100644 --- a/audio/test/unittest/hdi/client/render/BUILD.gn +++ b/audio/test/unittest/hdi/client/render/BUILD.gn @@ -15,7 +15,6 @@ hdf_audio_path = "./../../../../.." hdf_audio_test_path = "./.." import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("$hdf_audio_path/audio.gni") ohos_unittest("hdf_audio_proxy_render_test") { diff --git a/audio/test/unittest/hdi/client_advance/BUILD.gn b/audio/test/unittest/hdi/client_advance/BUILD.gn index ff1224b8b7..bb664e41fd 100644 --- a/audio/test/unittest/hdi/client_advance/BUILD.gn +++ b/audio/test/unittest/hdi/client_advance/BUILD.gn @@ -12,11 +12,10 @@ # limitations under the License. import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("./../../../../audio.gni") group("hdi_client_advance") { - if (!defined(ohos_lite) && !drivers_peripheral_audio_user_mode) { + if (!defined(ohos_lite) && !drivers_peripheral_audio_feature_user_mode) { testonly = true deps = [ "adapter:hdf_audio_proxy_adapter_advance_test", diff --git a/audio/test/unittest/hdi/client_advance/adapter/BUILD.gn b/audio/test/unittest/hdi/client_advance/adapter/BUILD.gn index 9f91ec1e64..ebd61fae2b 100644 --- a/audio/test/unittest/hdi/client_advance/adapter/BUILD.gn +++ b/audio/test/unittest/hdi/client_advance/adapter/BUILD.gn @@ -15,7 +15,6 @@ hdf_audio_path = "./../../../../.." hdf_audio_test_path = "./.." import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("$hdf_audio_path/audio.gni") ohos_unittest("hdf_audio_proxy_adapter_advance_test") { diff --git a/audio/test/unittest/hdi/client_advance/capture/BUILD.gn b/audio/test/unittest/hdi/client_advance/capture/BUILD.gn index 75c4a39e76..2359b4c82d 100644 --- a/audio/test/unittest/hdi/client_advance/capture/BUILD.gn +++ b/audio/test/unittest/hdi/client_advance/capture/BUILD.gn @@ -15,7 +15,6 @@ hdf_audio_path = "./../../../../.." hdf_audio_test_path = "./.." import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("$hdf_audio_path/audio.gni") ohos_unittest("hdf_audio_proxy_capture_advance_test") { diff --git a/audio/test/unittest/hdi/client_advance/common/BUILD.gn b/audio/test/unittest/hdi/client_advance/common/BUILD.gn index bdb6b26e0f..0447dfcb08 100644 --- a/audio/test/unittest/hdi/client_advance/common/BUILD.gn +++ b/audio/test/unittest/hdi/client_advance/common/BUILD.gn @@ -14,7 +14,6 @@ hdf_audio_path = "./../../../../.." import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("$hdf_audio_path/audio.gni") ohos_unittest("hdf_audio_proxy_common_advance_test") { diff --git a/audio/test/unittest/hdi/client_advance/manager/BUILD.gn b/audio/test/unittest/hdi/client_advance/manager/BUILD.gn index c3e6de3838..d9603129b8 100644 --- a/audio/test/unittest/hdi/client_advance/manager/BUILD.gn +++ b/audio/test/unittest/hdi/client_advance/manager/BUILD.gn @@ -15,7 +15,6 @@ hdf_audio_path = "./../../../../.." hdf_audio_test_path = "./.." import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("$hdf_audio_path/audio.gni") ohos_unittest("hdf_audio_proxy_manager_advance_test") { diff --git a/audio/test/unittest/hdi/client_advance/render/BUILD.gn b/audio/test/unittest/hdi/client_advance/render/BUILD.gn index 5aea1321c9..55ab357d75 100644 --- a/audio/test/unittest/hdi/client_advance/render/BUILD.gn +++ b/audio/test/unittest/hdi/client_advance/render/BUILD.gn @@ -15,7 +15,6 @@ hdf_audio_path = "./../../../../.." hdf_audio_test_path = "./.." import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("$hdf_audio_path/audio.gni") ohos_unittest("hdf_audio_proxy_render_advance_test") { diff --git a/audio/test/unittest/hdi/jack/BUILD.gn b/audio/test/unittest/hdi/jack/BUILD.gn index 3418ea8f84..946cdffd05 100644 --- a/audio/test/unittest/hdi/jack/BUILD.gn +++ b/audio/test/unittest/hdi/jack/BUILD.gn @@ -21,7 +21,6 @@ if (defined(ohos_lite)) { } else { import("//build/ohos.gni") import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("$hdf_audio_path/audio.gni") } @@ -78,10 +77,8 @@ if (defined(ohos_lite)) { "$hdf_audio_test_path/input/hal:hdi_input", "//drivers/hdf_core/adapter/build/test_common:libhdf_test_common", ] - if (!drivers_peripheral_audio_user_mode) { + if (!drivers_peripheral_audio_feature_user_mode) { deps += [ "$hdf_audio_path/hal/hdi_passthrough:hdi_audio" ] - } else { - deps += [ "//device/soc/${product_company}/common/hal/media:hdi_audio" ] } if (is_standard_system) { diff --git a/audio/test/unittest/hdi/passthrough/BUILD.gn b/audio/test/unittest/hdi/passthrough/BUILD.gn index 03565b3f06..d0688f74fe 100644 --- a/audio/test/unittest/hdi/passthrough/BUILD.gn +++ b/audio/test/unittest/hdi/passthrough/BUILD.gn @@ -16,7 +16,6 @@ if (defined(ohos_lite)) { import("./../../../../audio.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("./../../../../audio.gni") } diff --git a/audio/test/unittest/hdi/passthrough/adapter/BUILD.gn b/audio/test/unittest/hdi/passthrough/adapter/BUILD.gn index 395554c974..9da86bb100 100644 --- a/audio/test/unittest/hdi/passthrough/adapter/BUILD.gn +++ b/audio/test/unittest/hdi/passthrough/adapter/BUILD.gn @@ -19,7 +19,6 @@ if (defined(ohos_lite)) { import("$hdf_audio_path/audio.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("$hdf_audio_path/audio.gni") } @@ -73,14 +72,12 @@ if (defined(ohos_lite)) { "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] - if (!drivers_peripheral_audio_user_mode) { + if (!drivers_peripheral_audio_feature_user_mode) { deps += [ "$hdf_audio_path/hal/hdi_passthrough:hdi_audio" ] external_deps = [ "c_utils:utils", "hdf_core:libhdf_utils", ] - } else { - deps += [ "//device/soc/${product_company}/common/hal/media:hdi_audio" ] } } } diff --git a/audio/test/unittest/hdi/passthrough/capture/BUILD.gn b/audio/test/unittest/hdi/passthrough/capture/BUILD.gn index ed655d53c8..508d2df1d3 100644 --- a/audio/test/unittest/hdi/passthrough/capture/BUILD.gn +++ b/audio/test/unittest/hdi/passthrough/capture/BUILD.gn @@ -19,7 +19,6 @@ if (defined(ohos_lite)) { import("$hdf_audio_path/audio.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("$hdf_audio_path/audio.gni") } @@ -74,18 +73,16 @@ if (defined(ohos_lite)) { "//third_party/googletest:gtest_main", ] - if (drivers_peripheral_audio_alsa_lib) { + if (drivers_peripheral_audio_feature_alsa_lib) { defines = [ "ALSA_LIB_MODE" ] } - if (!drivers_peripheral_audio_user_mode) { + if (!drivers_peripheral_audio_feature_user_mode) { deps += [ "$hdf_audio_path/hal/hdi_passthrough:hdi_audio" ] external_deps = [ "c_utils:utils", "hdf_core:libhdf_utils", ] - } else { - deps += [ "//device/soc/${product_company}/common/hal/media:hdi_audio" ] } } } diff --git a/audio/test/unittest/hdi/passthrough/manager/BUILD.gn b/audio/test/unittest/hdi/passthrough/manager/BUILD.gn index 743cf21a49..34d5993ecc 100644 --- a/audio/test/unittest/hdi/passthrough/manager/BUILD.gn +++ b/audio/test/unittest/hdi/passthrough/manager/BUILD.gn @@ -18,7 +18,6 @@ if (defined(ohos_lite)) { import("$hdf_audio_path/audio.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("$hdf_audio_path/audio.gni") } @@ -64,14 +63,12 @@ if (defined(ohos_lite)) { "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] - if (!drivers_peripheral_audio_user_mode) { + if (!drivers_peripheral_audio_feature_user_mode) { deps += [ "$hdf_audio_path/hal/hdi_passthrough:hdi_audio" ] external_deps = [ "c_utils:utils", "hdf_core:libhdf_utils", ] - } else { - deps += [ "//device/soc/${product_company}/common/hal/media:hdi_audio" ] } } } diff --git a/audio/test/unittest/hdi/passthrough/render/BUILD.gn b/audio/test/unittest/hdi/passthrough/render/BUILD.gn index 897aa9fa1a..5c31232901 100644 --- a/audio/test/unittest/hdi/passthrough/render/BUILD.gn +++ b/audio/test/unittest/hdi/passthrough/render/BUILD.gn @@ -19,7 +19,6 @@ if (defined(ohos_lite)) { import("$hdf_audio_path/audio.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("$hdf_audio_path/audio.gni") } @@ -74,18 +73,16 @@ if (defined(ohos_lite)) { "//third_party/googletest:gtest_main", ] - if (drivers_peripheral_audio_alsa_lib) { + if (drivers_peripheral_audio_feature_alsa_lib) { defines = [ "ALSA_LIB_MODE" ] } - if (!drivers_peripheral_audio_user_mode) { + if (!drivers_peripheral_audio_feature_user_mode) { deps += [ "$hdf_audio_path/hal/hdi_passthrough:hdi_audio" ] external_deps = [ "c_utils:utils", "hdf_core:libhdf_utils", ] - } else { - deps += [ "//device/soc/${product_company}/common/hal/media:hdi_audio" ] } } } diff --git a/audio/test/unittest/supportlibs/BUILD.gn b/audio/test/unittest/supportlibs/BUILD.gn index eed296bb5b..9e67fa46af 100644 --- a/audio/test/unittest/supportlibs/BUILD.gn +++ b/audio/test/unittest/supportlibs/BUILD.gn @@ -16,7 +16,6 @@ if (defined(ohos_lite)) { import("./../../../audio.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("./../../../audio.gni") } diff --git a/audio/test/unittest/supportlibs/interface_lib_capture/BUILD.gn b/audio/test/unittest/supportlibs/interface_lib_capture/BUILD.gn index cfe6ecefc6..f56561d16f 100644 --- a/audio/test/unittest/supportlibs/interface_lib_capture/BUILD.gn +++ b/audio/test/unittest/supportlibs/interface_lib_capture/BUILD.gn @@ -18,7 +18,7 @@ if (defined(ohos_lite)) { import("$hdf_audio_path/audio.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") + import("$hdf_audio_path/audio.gni") } @@ -54,7 +54,7 @@ if (defined(ohos_lite)) { module_out_path = module_output_path sources = [] include_dirs = [] - if (drivers_peripheral_audio_alsa_lib) { + if (drivers_peripheral_audio_feature_alsa_lib) { sources += [ "./src/audio_alsa_if_lib_capture_test.cpp" ] include_dirs += [ "$hdf_audio_path/supportlibs/alsa_adapter/include", diff --git a/audio/test/unittest/supportlibs/interface_lib_render/BUILD.gn b/audio/test/unittest/supportlibs/interface_lib_render/BUILD.gn index 411ea1a4dd..fecfc44de3 100644 --- a/audio/test/unittest/supportlibs/interface_lib_render/BUILD.gn +++ b/audio/test/unittest/supportlibs/interface_lib_render/BUILD.gn @@ -18,7 +18,7 @@ if (defined(ohos_lite)) { import("$hdf_audio_path/audio.gni") } else { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") + import("$hdf_audio_path/audio.gni") } @@ -54,7 +54,7 @@ if (defined(ohos_lite)) { module_out_path = module_output_path sources = [] include_dirs = [] - if (drivers_peripheral_audio_alsa_lib) { + if (drivers_peripheral_audio_feature_alsa_lib) { sources += [ "./src/audio_alsa_if_lib_render_test.cpp" ] include_dirs += [ "$hdf_audio_path/supportlibs/alsa_adapter/include", -- Gitee