From ae3b203858e1780a1c110d880ce1cdf525ffec0a Mon Sep 17 00:00:00 2001 From: JanierVan Date: Fri, 28 Apr 2023 03:09:11 +0000 Subject: [PATCH] feat: decouple audio and vendor 3 Signed-off-by: JanierVan --- audio/bundle.json | 19 ------ audio/effect/host/BUILD.gn | 1 - audio/hal/hdi_passthrough/BUILD.gn | 14 +++-- audio/hdi_service/pathselect/BUILD.gn | 1 - audio/hdi_service/primary/BUILD.gn | 9 +-- audio/hdi_service/primary_impl/BUILD.gn | 1 - audio/hdi_service/supportlibs/BUILD.gn | 24 +++----- audio/supportlibs/BUILD.gn | 20 +++---- audio/test/sample/BUILD.gn | 3 - .../adm/audio_adm_interface/BUILD.gn | 1 - .../audio_function/audio_pathroute/BUILD.gn | 1 - .../audio_function/audio_smartpa/BUILD.gn | 1 - audio/test/systemtest/hdi_service/BUILD.gn | 1 - .../hdi_service/common/adapter/BUILD.gn | 1 - .../hdi_service/common/capture/BUILD.gn | 1 - .../hdi_service/common/manager/BUILD.gn | 1 - .../hdi_service/common/render/BUILD.gn | 1 - .../hdi_service/hdiperformace/BUILD.gn | 1 - .../hispark_taurus_standard/capture/BUILD.gn | 1 - .../hispark_taurus_standard/render/BUILD.gn | 1 - .../hdi_service/rk3568/capture/BUILD.gn | 1 - .../hdi_service/rk3568/render/BUILD.gn | 1 - audio/test/unittest/adm/BUILD.gn | 58 ------------------- audio/test/unittest/driver/BUILD.gn | 52 ----------------- audio/test/unittest/hdi/jack/BUILD.gn | 2 - 25 files changed, 28 insertions(+), 189 deletions(-) delete mode 100644 audio/test/unittest/adm/BUILD.gn delete mode 100644 audio/test/unittest/driver/BUILD.gn diff --git a/audio/bundle.json b/audio/bundle.json index 3aa00acaf9..50d351440d 100755 --- a/audio/bundle.json +++ b/audio/bundle.json @@ -51,25 +51,6 @@ "//drivers/peripheral/audio/test/sample:idl_audio_sample", "//drivers/peripheral/audio/test/audio_utils/audio_mixer:audio_mixer", "//drivers/peripheral/audio/effect/test:effect_test" - ], - "inner_kits":[ - { - "name": "//drivers/interface/audio/v1_0:libaudio_proxy_1.0", - "header": { - "header_files": [ - "audio_adapter.h", - "audio_attribute.h", - "audio_capture.h", - "audio_control.h", - "audio_manager.h", - "audio_render.h", - "audio_scene.h", - "audio_types.h", - "audio_volume.h" - ], - "header_base": "//drivers/peripheral/audio/interfaces/include" - } - } ] } } diff --git a/audio/effect/host/BUILD.gn b/audio/effect/host/BUILD.gn index b37f2f11bf..7f3de2442a 100644 --- a/audio/effect/host/BUILD.gn +++ b/audio/effect/host/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//drivers/hdf_core/adapter/uhdf2/hdi.gni") ohos_shared_library("effect_model_service") { sources = [ "audio_effect_driver.c" ] diff --git a/audio/hal/hdi_passthrough/BUILD.gn b/audio/hal/hdi_passthrough/BUILD.gn index bacb93345d..10030d8eed 100644 --- a/audio/hal/hdi_passthrough/BUILD.gn +++ b/audio/hal/hdi_passthrough/BUILD.gn @@ -32,11 +32,13 @@ if (defined(ohos_lite)) { "//third_party/bounds_checking_function/include", ] deps = [ - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio_common", "//third_party/bounds_checking_function:libsec_shared", ] - external_deps = [ "hdf_core:libhdf_utils" ] + external_deps = [ + "hdf_core:libhdf_utils", + "hilog_featured_lite:hilog_shared", + ] defines = [] if (drivers_peripheral_audio_feature_hal_notsupport_pathselect) { defines += [ "AUDIO_HAL_NOTSUPPORT_PATHSELECT" ] @@ -118,11 +120,11 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/interfaces/include", "//third_party/bounds_checking_function/include", ] - deps = [ - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//third_party/bounds_checking_function:libsec_shared", + deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + external_deps = [ + "hdf_core:libhdf_utils", + "hilog_featured_lite:hilog_shared", ] - external_deps = [ "hdf_core:libhdf_utils" ] defines = [] if (drivers_peripheral_audio_feature_hal_notsupport_pathselect) { defines += [ "AUDIO_HAL_NOTSUPPORT_PATHSELECT" ] diff --git a/audio/hdi_service/pathselect/BUILD.gn b/audio/hdi_service/pathselect/BUILD.gn index 735acb44ec..8111825ed3 100644 --- a/audio/hdi_service/pathselect/BUILD.gn +++ b/audio/hdi_service/pathselect/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//drivers/hdf_core/adapter/uhdf2/hdi.gni") import("//drivers/peripheral/audio/audio.gni") ohos_shared_library("audio_path_select") { diff --git a/audio/hdi_service/primary/BUILD.gn b/audio/hdi_service/primary/BUILD.gn index bf73c30cb5..a183441d30 100644 --- a/audio/hdi_service/primary/BUILD.gn +++ b/audio/hdi_service/primary/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//drivers/hdf_core/adapter/uhdf2/hdi.gni") import("//drivers/peripheral/audio/audio.gni") ohos_shared_library("audio_primary_driver") { @@ -31,10 +30,8 @@ ohos_shared_library("audio_primary_driver") { external_deps = [ "hilog:libhilog" ] } - deps = [ - "//drivers/interface/audio/v1_0:libaudio_stub_1.0", - "//third_party/bounds_checking_function:libsec_shared", - ] + deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + external_deps += [ "drivers_interface_audio:libaudio_stub_1.0" ] shlib_type = "hdi" install_images = [ chipset_base_dir ] @@ -58,7 +55,7 @@ ohos_shared_library("audio_manager_service_1.0") { external_deps = [ "hilog:libhilog" ] } - deps = [ "//drivers/interface/audio/v1_0:libaudio_stub_1.0" ] + external_deps += [ "drivers_interface_audio:libaudio_stub_1.0" ] install_images = [ chipset_base_dir ] subsystem_name = "hdf" diff --git a/audio/hdi_service/primary_impl/BUILD.gn b/audio/hdi_service/primary_impl/BUILD.gn index bf99f58cc2..3148b9293f 100644 --- a/audio/hdi_service/primary_impl/BUILD.gn +++ b/audio/hdi_service/primary_impl/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//drivers/hdf_core/adapter/uhdf2/hdi.gni") import("//drivers/peripheral/audio/audio.gni") ohos_shared_library("audio_primary_impl_vendor") { diff --git a/audio/hdi_service/supportlibs/BUILD.gn b/audio/hdi_service/supportlibs/BUILD.gn index 778379b804..d7caff7508 100644 --- a/audio/hdi_service/supportlibs/BUILD.gn +++ b/audio/hdi_service/supportlibs/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//drivers/hdf_core/adapter/uhdf2/hdi.gni") import("//drivers/peripheral/audio/audio.gni") if (defined(ohos_lite)) { @@ -29,16 +28,15 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/supportlibs/interfaces/include", "//third_party/bounds_checking_function/include", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/", - "//device/hisilicon/hispark_taurus/sdk_linux/huawei_proprietary/include", "//drivers/peripheral/audio/hdi_service/vendor_interface/utils", ] - public_deps = [ "//drivers/interface/audio/v1_0:audio_idl_headers" ] - deps = [ - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//third_party/bounds_checking_function:libsec_shared", + public_deps = [ "drivers_interface_audio:audio_idl_headers" ] + deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + external_deps = [ + "hdf_core:libhdf_utils", + "hilog_featured_lite:hilog_shared", ] - external_deps = [ "hdf_core:libhdf_utils" ] subsystem_name = "hdf" part_name = "drivers_peripheral_audio" } @@ -50,7 +48,7 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/supportlibs/adm_adapter/src/audio_interface_lib_render.c", ] - public_deps = [ "//drivers/interface/audio/v1_0:audio_idl_headers" ] + public_deps = [ "drivers_interface_audio:audio_idl_headers" ] include_dirs = [ "//drivers/peripheral/audio/hdi_service/primary_impl/include", @@ -58,14 +56,12 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/supportlibs/interfaces/include", "//third_party/bounds_checking_function/include", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/", - "//device/hisilicon/hispark_taurus/sdk_linux/huawei_proprietary/include", "//drivers/peripheral/audio/hdi_service/vendor_interface/utils", ] - deps = [ - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//third_party/bounds_checking_function:libsec_shared", - ] + deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + + external_deps = [ "hilog_featured_lite:hilog_shared" ] if (enable_audio_hal_hdf_log) { defines = [ "AUDIO_HDF_LOG" ] } @@ -94,7 +90,6 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/hdi_service/primary_impl/include", "//drivers/peripheral/audio/supportlibs/interfaces/include", "//third_party/bounds_checking_function/include", - "//device/hisilicon/hispark_taurus/sdk_linux/huawei_proprietary/include", "//drivers/peripheral/audio/hdi_service/vendor_interface/utils", ] @@ -154,7 +149,6 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/hdi_service/primary_impl/include", "//drivers/peripheral/audio/supportlibs/interfaces/include", "//third_party/bounds_checking_function/include", - "//device/hisilicon/hispark_taurus/sdk_linux/huawei_proprietary/include", "//drivers/peripheral/audio/hdi_service/vendor_interface/utils", ] diff --git a/audio/supportlibs/BUILD.gn b/audio/supportlibs/BUILD.gn index aa2b0543d1..4e9d8aa58e 100644 --- a/audio/supportlibs/BUILD.gn +++ b/audio/supportlibs/BUILD.gn @@ -40,14 +40,13 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/interfaces/include", "//third_party/bounds_checking_function/include", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/", - "//device/hisilicon/hispark_taurus/sdk_linux/huawei_proprietary/include", ] - deps = [ - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//third_party/bounds_checking_function:libsec_shared", + deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + external_deps = [ + "hdf_core:libhdf_utils", + "hilog_featured_lite:hilog_shared", ] - external_deps = [ "hdf_core:libhdf_utils" ] public_configs = [ ":audio_interface_config" ] defines = [ "_GNU_SOURCE" ] subsystem_name = "hdf" @@ -68,14 +67,13 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/interfaces/include", "//third_party/bounds_checking_function/include", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/", - "//device/hisilicon/hispark_taurus/sdk_linux/huawei_proprietary/include", ] - deps = [ - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//third_party/bounds_checking_function:libsec_shared", + deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + external_deps = [ + "hdf_core:libhdf_utils", + "hilog_featured_lite:hilog_shared", ] - external_deps = [ "hdf_core:libhdf_utils" ] defines = [ "_GNU_SOURCE" ] if (enable_audio_hal_hdf_log) { defines += [ "AUDIO_HDF_LOG" ] @@ -106,7 +104,6 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/interfaces/include", "//drivers/peripheral/audio/supportlibs/interfaces/include", "//third_party/bounds_checking_function/include", - "//device/hisilicon/hispark_taurus/sdk_linux/huawei_proprietary/include", ] deps = [] @@ -165,7 +162,6 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/interfaces/include", "//drivers/peripheral/audio/supportlibs/interfaces/include", "//third_party/bounds_checking_function/include", - "//device/hisilicon/hispark_taurus/sdk_linux/huawei_proprietary/include", ] deps = [] diff --git a/audio/test/sample/BUILD.gn b/audio/test/sample/BUILD.gn index e439e0f364..4c244d6e87 100644 --- a/audio/test/sample/BUILD.gn +++ b/audio/test/sample/BUILD.gn @@ -14,7 +14,6 @@ hdf_audio_path = "./../.." import("//build/ohos.gni") -import("//drivers/hdf_core/adapter/uhdf2/hdi.gni") import("$hdf_audio_path/audio.gni") if (defined(ohos_lite)) { @@ -22,7 +21,6 @@ if (defined(ohos_lite)) { include_dirs = [ "$hdf_audio_path/interfaces/include", "./", - "//commonlibrary/utils_lite/include", "//third_party/bounds_checking_function/include", ] @@ -43,7 +41,6 @@ if (defined(ohos_lite)) { include_dirs = [ "$hdf_audio_path/interfaces/include", "./", - "//commonlibrary/utils_lite/include", "//third_party/bounds_checking_function/include", "$hdf_audio_path/hal/hdi_binder/server/include", ] diff --git a/audio/test/systemtest/adm/audio_adm_interface/BUILD.gn b/audio/test/systemtest/adm/audio_adm_interface/BUILD.gn index 10e4abc3ae..7ae36be234 100644 --- a/audio/test/systemtest/adm/audio_adm_interface/BUILD.gn +++ b/audio/test/systemtest/adm/audio_adm_interface/BUILD.gn @@ -39,7 +39,6 @@ if (defined(ohos_lite)) { ] public_deps = [ - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//drivers/hdf_core/adapter/uhdf/manager:hdf_core", "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", "//third_party/bounds_checking_function:libsec_shared", diff --git a/audio/test/systemtest/audio_function/audio_pathroute/BUILD.gn b/audio/test/systemtest/audio_function/audio_pathroute/BUILD.gn index 2d3c399973..32f24c23e4 100644 --- a/audio/test/systemtest/audio_function/audio_pathroute/BUILD.gn +++ b/audio/test/systemtest/audio_function/audio_pathroute/BUILD.gn @@ -39,7 +39,6 @@ if (defined(ohos_lite)) { public_deps = [ "$hdf_audio_path/hal/hdi_passthrough:hdi_audio", - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//drivers/hdf_core/adapter/uhdf/manager:hdf_core", "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", "//third_party/bounds_checking_function:libsec_shared", diff --git a/audio/test/systemtest/audio_function/audio_smartpa/BUILD.gn b/audio/test/systemtest/audio_function/audio_smartpa/BUILD.gn index 11b16247ef..c61d4a794c 100644 --- a/audio/test/systemtest/audio_function/audio_smartpa/BUILD.gn +++ b/audio/test/systemtest/audio_function/audio_smartpa/BUILD.gn @@ -47,7 +47,6 @@ if (defined(ohos_lite)) { public_deps = [ "$hdf_audio_path/hal/hdi_passthrough:hdi_audio", - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//drivers/hdf_core/adapter/uhdf/manager:hdf_core", "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", "//third_party/bounds_checking_function:libsec_shared", diff --git a/audio/test/systemtest/hdi_service/BUILD.gn b/audio/test/systemtest/hdi_service/BUILD.gn index efe012013c..dffaab9920 100644 --- a/audio/test/systemtest/hdi_service/BUILD.gn +++ b/audio/test/systemtest/hdi_service/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/hdi.gni") import("./../../../audio.gni") group("hdi_service_st") { diff --git a/audio/test/systemtest/hdi_service/common/adapter/BUILD.gn b/audio/test/systemtest/hdi_service/common/adapter/BUILD.gn index 6d426ab3a3..31d01c2fab 100644 --- a/audio/test/systemtest/hdi_service/common/adapter/BUILD.gn +++ b/audio/test/systemtest/hdi_service/common/adapter/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/hdi.gni") import("./../../../../../audio.gni") module_output_path = "drivers_peripheral_audio/audio" diff --git a/audio/test/systemtest/hdi_service/common/capture/BUILD.gn b/audio/test/systemtest/hdi_service/common/capture/BUILD.gn index 34b8c10ca5..7593e37399 100644 --- a/audio/test/systemtest/hdi_service/common/capture/BUILD.gn +++ b/audio/test/systemtest/hdi_service/common/capture/BUILD.gn @@ -13,7 +13,6 @@ if (!defined(ohos_lite)) { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/hdi.gni") } import("./../../../../../audio.gni") diff --git a/audio/test/systemtest/hdi_service/common/manager/BUILD.gn b/audio/test/systemtest/hdi_service/common/manager/BUILD.gn index dcdbc90b92..75b18ad7ab 100644 --- a/audio/test/systemtest/hdi_service/common/manager/BUILD.gn +++ b/audio/test/systemtest/hdi_service/common/manager/BUILD.gn @@ -13,7 +13,6 @@ if (!defined(ohos_lite)) { import("//build/test.gni") - import("//drivers/hdf_core/adapter/uhdf2/hdi.gni") } import("./../../../../../audio.gni") diff --git a/audio/test/systemtest/hdi_service/common/render/BUILD.gn b/audio/test/systemtest/hdi_service/common/render/BUILD.gn index 7cc80f87bf..0938c65a7d 100644 --- a/audio/test/systemtest/hdi_service/common/render/BUILD.gn +++ b/audio/test/systemtest/hdi_service/common/render/BUILD.gn @@ -14,7 +14,6 @@ hdf_audio_path = "./../../../../.." import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/hdi.gni") import("$hdf_audio_path/audio.gni") module_output_path = "drivers_peripheral_audio/audio" diff --git a/audio/test/systemtest/hdi_service/hdiperformace/BUILD.gn b/audio/test/systemtest/hdi_service/hdiperformace/BUILD.gn index 9dd5a23618..52874c3cf4 100644 --- a/audio/test/systemtest/hdi_service/hdiperformace/BUILD.gn +++ b/audio/test/systemtest/hdi_service/hdiperformace/BUILD.gn @@ -14,7 +14,6 @@ hdf_audio_path = "./../../../.." import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/hdi.gni") import("$hdf_audio_path/audio.gni") module_output_path = "drivers_peripheral_audio/audio" 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 de1ed0ae16..ba7c046228 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 @@ -12,7 +12,6 @@ # limitations under the License. import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/hdi.gni") import("./../../../../../audio.gni") module_output_path = "drivers_peripheral_audio/audio" 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 39b7910220..6739a6ff49 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 @@ -14,7 +14,6 @@ hdf_audio_path = "./../../../../.." import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/hdi.gni") import("$hdf_audio_path/audio.gni") module_output_path = "drivers_peripheral_audio/audio" diff --git a/audio/test/systemtest/hdi_service/rk3568/capture/BUILD.gn b/audio/test/systemtest/hdi_service/rk3568/capture/BUILD.gn index c4e39d25da..74cf4dc216 100644 --- a/audio/test/systemtest/hdi_service/rk3568/capture/BUILD.gn +++ b/audio/test/systemtest/hdi_service/rk3568/capture/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/hdi.gni") import("./../../../../../audio.gni") module_output_path = "drivers_peripheral_audio/audio" diff --git a/audio/test/systemtest/hdi_service/rk3568/render/BUILD.gn b/audio/test/systemtest/hdi_service/rk3568/render/BUILD.gn index c00bf00b86..c4670e73f1 100644 --- a/audio/test/systemtest/hdi_service/rk3568/render/BUILD.gn +++ b/audio/test/systemtest/hdi_service/rk3568/render/BUILD.gn @@ -14,7 +14,6 @@ hdf_audio_path = "./../../../../.." import("//build/test.gni") -import("//drivers/hdf_core/adapter/uhdf2/hdi.gni") import("$hdf_audio_path/audio.gni") module_output_path = "drivers_peripheral_audio/audio" diff --git a/audio/test/unittest/adm/BUILD.gn b/audio/test/unittest/adm/BUILD.gn deleted file mode 100644 index e6a27b965b..0000000000 --- a/audio/test/unittest/adm/BUILD.gn +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright (c) 2021 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/test.gni") - -module_output_path = "hdf/audio" -ohos_unittest("khdf_audio_adm_test") { - module_out_path = module_output_path - - include_dirs = [ - "//drivers/hdf_core/framework/test/unittest/model/audio/include", - "//drivers/hdf_core/framework/model/audio/core/test/unittest/common", - "//drivers/hdf_core/framework/model/audio/common/test/unittest/common", - ] - - defines = [ "__USER__" ] - sources = [ - "//drivers/hdf_core/framework/model/audio/common/test/unittest/common/audio_codec_base_test.cpp", - "//drivers/hdf_core/framework/model/audio/common/test/unittest/common/audio_dai_base_test.cpp", - "//drivers/hdf_core/framework/model/audio/common/test/unittest/common/audio_dma_base_test.cpp", - "//drivers/hdf_core/framework/model/audio/common/test/unittest/common/audio_dsp_base_test.cpp", - "//drivers/hdf_core/framework/model/audio/common/test/unittest/common/audio_platform_base_test.cpp", - "//drivers/hdf_core/framework/model/audio/core/test/unittest/common/audio_core_test.cpp", - "//drivers/hdf_core/framework/model/audio/core/test/unittest/common/audio_host_test.cpp", - "//drivers/hdf_core/framework/model/audio/core/test/unittest/common/audio_parse_test.cpp", - "//drivers/hdf_core/framework/model/audio/sapm/test/unittest/common/audio_sapm_test.cpp", - ] - - cflags = [ - "-Wall", - "-Wextra", - "-Werror", - "-fsigned-char", - "-fno-common", - "-fno-strict-aliasing", - ] - - deps = [ "//drivers/hdf_core/adapter/build/test_common:libhdf_test_common" ] - if (is_standard_system) { - external_deps = [ - "c_utils:utils", - "hdf_core:libhdf_utils", - "hiviewdfx_hilog_native:libhilog", - ] - } else { - external_deps = [ "hilog:libhilog" ] - } -} diff --git a/audio/test/unittest/driver/BUILD.gn b/audio/test/unittest/driver/BUILD.gn deleted file mode 100644 index d881669491..0000000000 --- a/audio/test/unittest/driver/BUILD.gn +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright (c) 2021 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/test.gni") - -module_output_path = "hdf/audio" -ohos_unittest("khdf_audio_driver_test") { - module_out_path = module_output_path - - include_dirs = [ - "//device/board/hisilicon/hispark_taurus/audio_drivers/unittest/include", - ] - - defines = [ "__USER__" ] - sources = [ - "//device/board/hisilicon/hispark_taurus/audio_drivers/unittest/src/hi3516_aiao_impl_test.cpp", - "//device/board/hisilicon/hispark_taurus/audio_drivers/unittest/src/hi3516_codec_impl_test.cpp", - "//device/board/hisilicon/hispark_taurus/audio_drivers/unittest/src/hi3516_codec_ops_test.cpp", - "//device/board/hisilicon/hispark_taurus/audio_drivers/unittest/src/hi3516_dai_ops_test.cpp", - "//device/board/hisilicon/hispark_taurus/audio_drivers/unittest/src/hi3516_dma_ops_test.cpp", - ] - - cflags = [ - "-Wall", - "-Wextra", - "-Werror", - "-fsigned-char", - "-fno-common", - "-fno-strict-aliasing", - ] - - deps = [ "//drivers/hdf_core/adapter/build/test_common:libhdf_test_common" ] - if (is_standard_system) { - external_deps = [ - "c_utils:utils", - "hdf_core:libhdf_utils", - "hiviewdfx_hilog_native:libhilog", - ] - } else { - external_deps = [ "hilog:libhilog" ] - } -} diff --git a/audio/test/unittest/hdi/jack/BUILD.gn b/audio/test/unittest/hdi/jack/BUILD.gn index 946cdffd05..c861f35ac4 100644 --- a/audio/test/unittest/hdi/jack/BUILD.gn +++ b/audio/test/unittest/hdi/jack/BUILD.gn @@ -30,7 +30,6 @@ if (defined(ohos_lite)) { include_dirs = [ "./include", - "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", "$hdf_audio_test_path/input/hal/include", "$hdf_audio_test_path/input/interfaces/include", "//third_party/bounds_checking_function/include", @@ -40,7 +39,6 @@ if (defined(ohos_lite)) { public_deps = [ "$hdf_audio_path/hal/hdi_passthrough:hdi_audio", "$hdf_audio_test_path/input/hal:hdi_input", - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//drivers/hdf_core/adapter/uhdf/manager:hdf_core", "//drivers/hdf_core/adapter/uhdf/platform:hdf_platform", "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal", -- Gitee