diff --git a/audio/bundle.json b/audio/bundle.json index 0c06adf83a6deb6ce6b469a06e9a8dc109687777..a6cd194dc20af4bae8897d286850c2317dd126af 100755 --- a/audio/bundle.json +++ b/audio/bundle.json @@ -50,25 +50,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 b37f2f11bfcefbe5cec55f389dc2be60f484f95f..7f3de2442a45f3d6f3b48f08b9724efecebc8609 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 de80d9c25e5bf2c85adae742f3058760423049cb..0241e6a8afcf1b6187c7ee88ca59d0d0d82bde1f 100644 --- a/audio/hal/hdi_passthrough/BUILD.gn +++ b/audio/hal/hdi_passthrough/BUILD.gn @@ -34,10 +34,12 @@ if (defined(ohos_lite)) { ] deps = [ ":hdi_audio_common", - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//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)) { "$hdf_audio_path/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 6019977dbb2314a2c341b4110c298fad83ddf640..93b06a8dcd581db3a492f64d654b0bc9bc810ca7 100644 --- a/audio/hdi_service/pathselect/BUILD.gn +++ b/audio/hdi_service/pathselect/BUILD.gn @@ -14,7 +14,6 @@ hdf_audio_path = "./../.." hdf_hdi_service_path = "./.." import("//build/ohos.gni") -import("//drivers/hdf_core/adapter/uhdf2/hdi.gni") import("$hdf_audio_path/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 34030052192cbd9bd3891677fcf948d69866a8a7..d7489e0a1c8c49d74d559ea14db7be92d3efc4d4 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("../../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 554c6db409aa9a00b18e4cddf9ec64982add1ca9..43968748340b47d0dd4910ab68cc95d470bcfa2a 100644 --- a/audio/hdi_service/primary_impl/BUILD.gn +++ b/audio/hdi_service/primary_impl/BUILD.gn @@ -14,7 +14,6 @@ hdf_audio_path = "./../.." hdf_hdi_service_path = "./.." import("//build/ohos.gni") -import("//drivers/hdf_core/adapter/uhdf2/hdi.gni") import("$hdf_audio_path/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 19d06cca9f8009c39181a58277a616455a6cc88a..7b3d274cbccdfd9e58f99cb8916a18333cb3fcd8 100644 --- a/audio/hdi_service/supportlibs/BUILD.gn +++ b/audio/hdi_service/supportlibs/BUILD.gn @@ -14,7 +14,6 @@ hdf_audio_path = "./../.." hdf_hdi_service_path = "./.." import("//build/ohos.gni") -import("//drivers/hdf_core/adapter/uhdf2/hdi.gni") import("$hdf_audio_path/audio.gni") if (defined(ohos_lite)) { @@ -31,16 +30,15 @@ if (defined(ohos_lite)) { "$hdf_audio_path/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", "$hdf_hdi_service_path/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" } @@ -52,7 +50,7 @@ if (defined(ohos_lite)) { "$hdf_hdi_service_path/primary_impl/src/audio_common.c", ] - public_deps = [ "//drivers/interface/audio/v1_0:audio_idl_headers" ] + public_deps = [ "drivers_interface_audio:audio_idl_headers" ] include_dirs = [ "$hdf_hdi_service_path/primary_impl/include", @@ -60,14 +58,12 @@ if (defined(ohos_lite)) { "$hdf_audio_path/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", "$hdf_hdi_service_path/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)) { "$hdf_hdi_service_path/primary_impl/include", "$hdf_audio_path/supportlibs/interfaces/include", "//third_party/bounds_checking_function/include", - "//device/hisilicon/hispark_taurus/sdk_linux/huawei_proprietary/include", "$hdf_hdi_service_path/vendor_interface/utils", ] @@ -151,7 +146,6 @@ if (defined(ohos_lite)) { "$hdf_hdi_service_path/primary_impl/include", "$hdf_audio_path/supportlibs/interfaces/include", "//third_party/bounds_checking_function/include", - "//device/hisilicon/hispark_taurus/sdk_linux/huawei_proprietary/include", "$hdf_hdi_service_path/vendor_interface/utils", ] diff --git a/audio/supportlibs/BUILD.gn b/audio/supportlibs/BUILD.gn index a6e5b7543bbf2694246a88ae4aa856e7586ad873..5fde721dd578379e8304bf61ba9b09245bd0f6d6 100644 --- a/audio/supportlibs/BUILD.gn +++ b/audio/supportlibs/BUILD.gn @@ -41,14 +41,13 @@ if (defined(ohos_lite)) { "$hdf_audio_path/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" @@ -69,14 +68,13 @@ if (defined(ohos_lite)) { "$hdf_audio_path/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)) { "$hdf_audio_path/interfaces/include", "interfaces/include", "//third_party/bounds_checking_function/include", - "//device/hisilicon/hispark_taurus/sdk_linux/huawei_proprietary/include", ] deps = [] @@ -163,7 +160,6 @@ if (defined(ohos_lite)) { "$hdf_audio_path/interfaces/include", "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 e439e0f364f3e0442ce1bacf3e5ad74478e78312..4c244d6e8763ed897580e97b4905440b311b4e5b 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 10e4abc3aebf7337e2e6cb5cbe81219a8b9afe9b..7ae36be234f48f9886010011671f69fb3d9b2323 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 2d3c399973dfe145e5ea6c6be0c19b5d0e274c83..32f24c23e4a89c9c230676a3d6f4bd3cc34601d5 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 11b16247efd5c3168a64d98f2fcccbfacbdd6807..c61d4a794c0b65eac74fffad43656e4af96e81cb 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 efe012013ce82ddd96c6e2bcca39556b2961a429..dffaab99200a018a1fa2841905db191cce1fc82b 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 6d426ab3a35498feaaca936942bd161a82a18930..31d01c2fabef85e1608a0c0e364d20fe7364d5ef 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 34b8c10ca509d68a0b632c7127a1659502752217..7593e373994f3092ed3df20b57abb03513347ab8 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 dcdbc90b929e09964f1cd6f334bee9f0e2bfb782..75b18ad7ab368d4c00a543bf612dd919c3406a2f 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 7cc80f87bfd1e86c1bf32c5b7af73eb0c3359f67..0938c65a7d4cf18a6490cab26e610be78e54f878 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 9dd5a236182b93b975d47c06177f73ffd7ca5255..52874c3cf4089c67b7494df75950e966717bd6fe 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 de1ed0ae1612ce966bb1eff450efa50c3bd9db0b..ba7c046228abdbfce86fff5fdb672cca4920c44b 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 39b7910220baf499234654ceea990e71c4e72414..6739a6ff4900f85d8a6103405fc299dc7158020c 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 c4e39d25dacfe2162075925ec6895595145813fb..74cf4dc216993e73355e6c8f9c18cdc3b9a8c3d9 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 c00bf00b862b8a8f014687232527a731fb50c82e..c4670e73f178612d7b71ffe8e4da35a6e19e3e81 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 e6a27b965b9abb87f4be5656b0c97a29058302e1..0000000000000000000000000000000000000000 --- 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 d88166949195f073801d590aea1c7e1eaba203f2..0000000000000000000000000000000000000000 --- 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 0d99dc6136f7e9f60199ca1f1b79b951080d210b..232e9f03be0205bc6ec31f8d3bff4717b0499625 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",