From a9e3f7c0f7f76b58db3ac283f25feafe8fcd05d0 Mon Sep 17 00:00:00 2001 From: yuanbo Date: Wed, 29 Sep 2021 12:13:51 +0800 Subject: [PATCH] optimize hdf utils dirs Signed-off-by: yuanbo --- audio/hal/hdi_binder/proxy/BUILD.gn | 34 +----- audio/hal/hdi_binder/server/BUILD.gn | 23 +--- audio/hal/hdi_passthrough/BUILD.gn | 15 +-- audio/hal/pathselect/BUILD.gn | 20 +-- audio/sample/BUILD.gn | 71 +---------- audio/supportlibs/adm_adapter/BUILD.gn | 49 +------- .../adm/audio_adm_interface/BUILD.gn | 11 +- .../adm_interface_lib/capture/BUILD.gn | 3 - .../adm_interface_lib/render/BUILD.gn | 3 - .../audio_function/audio_pathroute/BUILD.gn | 12 +- .../audio_function/audio_server/BUILD.gn | 4 - .../audio_function/audio_smartpa/BUILD.gn | 11 +- audio/test/systemtest/hdi/adapter/BUILD.gn | 3 - audio/test/systemtest/hdi/capture/BUILD.gn | 15 --- .../systemtest/hdi/hdiperformace/BUILD.gn | 6 - .../systemtest/hdi/hdireliability/BUILD.gn | 12 -- audio/test/systemtest/hdi/render/BUILD.gn | 15 --- audio/test/unittest/adm/BUILD.gn | 4 +- audio/test/unittest/driver/BUILD.gn | 4 +- audio/test/unittest/hdi/adapter/BUILD.gn | 8 +- audio/test/unittest/hdi/capture/BUILD.gn | 8 +- audio/test/unittest/hdi/manager/BUILD.gn | 8 +- audio/test/unittest/hdi/render/BUILD.gn | 8 +- .../lib/interface_lib_capture/BUILD.gn | 8 +- .../lib/interface_lib_render/BUILD.gn | 8 +- .../hispark_taurus/src/pipeline_core/BUILD.gn | 6 +- .../src/driver_adapter/main_test/BUILD.gn | 1 - .../platform/v4l2/src/driver_adapter/BUILD.gn | 1 - .../platform/v4l2/src/pipeline_core/BUILD.gn | 6 +- camera/hal/hdi_impl/BUILD.gn | 7 +- camera/hal/hdi_impl/test/BUILD.gn | 7 +- camera/hal/init/BUILD.gn | 7 +- camera/hal/pipeline_core/test/BUILD.gn | 6 +- camera/hal/test/fuzz/BUILD.gn | 21 ++-- camera/hal/test/mpi/BUILD.gn | 7 +- camera/hal_c/hdi_cif/BUILD.gn | 2 +- camera/interfaces/include/client/BUILD.gn | 5 +- codec/hdi_service/BUILD.gn | 4 +- codec/hdi_service/codec_test/BUILD.gn | 2 +- display/hal/default/BUILD.gn | 1 - display/interfaces/hdi_cpp/client/BUILD.gn | 4 +- display/interfaces/hdi_cpp/server/BUILD.gn | 4 +- display/test/unittest/BUILD.gn | 2 - input/hal/BUILD.gn | 3 +- input/test/unittest/BUILD.gn | 4 +- input/udriver/BUILD.gn | 2 +- misc/vibrator/hal/BUILD.gn | 3 +- misc/vibrator/test/performance/BUILD.gn | 3 +- misc/vibrator/test/unittest/BUILD.gn | 3 +- sensor/hal/BUILD.gn | 3 +- sensor/test/performance/BUILD.gn | 1 - sensor/test/unittest/BUILD.gn | 3 +- usb/ddk/BUILD.gn | 20 +-- usb/gadget/function/acm/BUILD.gn | 3 +- usb/gadget/function/ecm/BUILD.gn | 3 +- usb/gadget/function/master/BUILD.gn | 3 +- usb/net/BUILD.gn | 4 +- usb/sample/device/linux/BUILD.gn | 114 +----------------- usb/sample/device/liteos/BUILD.gn | 6 - usb/sample/host/BUILD.gn | 66 ++-------- usb/sample/host/liteos_test/BUILD.gn | 1 - usb/serial/BUILD.gn | 4 +- usb/test/moduletest/BUILD.gn | 26 +--- usb/test/performance/BUILD.gn | 2 - wlan/client/BUILD.gn | 3 +- wlan/hal/BUILD.gn | 3 +- wlan/hdi_service/BUILD.gn | 6 +- wlan/test/hdi_service/BUILD.gn | 10 +- wlan/test/performance/BUILD.gn | 4 +- wlan/test/unittest/BUILD.gn | 4 +- 70 files changed, 100 insertions(+), 663 deletions(-) mode change 100755 => 100644 usb/sample/host/liteos_test/BUILD.gn diff --git a/audio/hal/hdi_binder/proxy/BUILD.gn b/audio/hal/hdi_binder/proxy/BUILD.gn index bf7b3b0b62..dd348657b9 100755 --- a/audio/hal/hdi_binder/proxy/BUILD.gn +++ b/audio/hal/hdi_binder/proxy/BUILD.gn @@ -53,12 +53,6 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/hal/hdi_passthrough/include", "//drivers/peripheral/audio/hal/hdi_binder/proxy/include", "//drivers/peripheral/audio/hal/hdi_binder/server/include", - "$hdf_framework_path/include/core", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/include", "$hdf_framework_path/core/sec/include", "$hdf_framework_path/core/shared/include", "$hdf_framework_path/core/host/include", @@ -73,7 +67,7 @@ if (defined(ohos_lite)) { ] sources = [ - "$hdf_framework_path/ability/sbuf/src/hdf_sbuf.c", + "$hdf_framework_path/utils/src/hdf_sbuf.c", "//drivers/peripheral/audio/hal/hdi_passthrough/src/audio_adapter_info_common.c", "//drivers/peripheral/audio/hal/hdi_passthrough/src/audio_common.c", "//third_party/cJSON/cJSON.c", @@ -103,26 +97,7 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/hal/hdi_binder/proxy/include", "//drivers/peripheral/audio/hal/hdi_binder/server/include", "//third_party/cJSON", - "$hdf_framework_path/include/core", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include", "//third_party/bounds_checking_function/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_uhdf_path/osal/include", - "$hdf_framework_path/include", - "$hdf_framework_path/core/sec/include", - "$hdf_framework_path/core/shared/include", - "$hdf_framework_path/core/host/include", - "$hdf_framework_path/core/manager/include", - "$hdf_uhdf_path/include/devhost", - "$hdf_uhdf_path/devhost/include", - "$hdf_uhdf_path/devmgr/include", - "$hdf_uhdf_path/host/include", - "$hdf_uhdf_path/manager/include", - "$hdf_uhdf_path/include/host", ] sources = [ @@ -137,15 +112,10 @@ if (defined(ohos_lite)) { ] deps = [ - "$hdf_uhdf_path/config:libhdf_hcs", - "$hdf_uhdf_path/hcs:hdf_default.hcb", "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/host:hdf_devhost", "$hdf_uhdf_path/host:libhdf_host", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/manager:hdf_devmgr", - "$hdf_uhdf_path/manager:hdf_devmgr.rc", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio", "//utils/native/base:utils", ] diff --git a/audio/hal/hdi_binder/server/BUILD.gn b/audio/hal/hdi_binder/server/BUILD.gn index c7a76442c8..3509acf6b0 100755 --- a/audio/hal/hdi_binder/server/BUILD.gn +++ b/audio/hal/hdi_binder/server/BUILD.gn @@ -54,12 +54,6 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/hal/hdi_passthrough/include", "//drivers/peripheral/audio/hal/hdi_binder/proxy/include", "//drivers/peripheral/audio/hal/hdi_binder/server/include", - "$hdf_framework_path/include/core", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/include", "$hdf_framework_path/core/sec/include", "$hdf_framework_path/core/shared/include", "$hdf_framework_path/core/host/include", @@ -72,8 +66,8 @@ if (defined(ohos_lite)) { ] sources = [ - "$hdf_framework_path/ability/sbuf/src/hdf_sbuf.c", "$hdf_framework_path/support/posix/src/osal_mem.c", + "$hdf_framework_path/utils/src/hdf_sbuf.c", "src/hdf_audio_server.c", "src/hdf_audio_server_capture.c", "src/hdf_audio_server_common.c", @@ -97,15 +91,7 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/interfaces/include", "//drivers/peripheral/audio/hal/hdi_passthrough/include", "//drivers/peripheral/audio/hal/hdi_binder/server/include", - "$hdf_framework_path/include/core", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include", "//third_party/bounds_checking_function/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_uhdf_path/osal/include", ] sources = [ @@ -116,15 +102,10 @@ if (defined(ohos_lite)) { ] deps = [ - "$hdf_uhdf_path/config:libhdf_hcs", - "$hdf_uhdf_path/hcs:hdf_default.hcb", "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/host:hdf_devhost", "$hdf_uhdf_path/host:libhdf_host", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/manager:hdf_devmgr", - "$hdf_uhdf_path/manager:hdf_devmgr.rc", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio", "//utils/native/base:utils", ] diff --git a/audio/hal/hdi_passthrough/BUILD.gn b/audio/hal/hdi_passthrough/BUILD.gn index 7d6377317e..6ee3f5156e 100755 --- a/audio/hal/hdi_passthrough/BUILD.gn +++ b/audio/hal/hdi_passthrough/BUILD.gn @@ -69,7 +69,6 @@ if (defined(ohos_lite)) { "$hdf_framework_path/include/core", "$hdf_framework_path/include/utils", "$hdf_framework_path/include/osal", - "$hdf_framework_path/ability/sbuf/include", "//drivers//adapter/khdf/liteos/osal/include", "//third_party/bounds_checking_function/include", ] @@ -106,28 +105,16 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/supportlibs/adm_adapter/include", "//third_party/cJSON", "//drivers/peripheral/audio/interfaces/include", - "$hdf_framework_path/include/core", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include", "//third_party/bounds_checking_function/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", "$hdf_uhdf_path/osal/include", "$hdf_uhdf_path/common/include/core", ] deps = [ - "$hdf_uhdf_path/config:libhdf_hcs", - "$hdf_uhdf_path/hcs:hdf_default.hcb", "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/host:hdf_devhost", "$hdf_uhdf_path/host:libhdf_host", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/manager:hdf_devmgr", - "$hdf_uhdf_path/manager:hdf_devmgr.rc", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] diff --git a/audio/hal/pathselect/BUILD.gn b/audio/hal/pathselect/BUILD.gn index 04664f3121..ad1b17ff8e 100755 --- a/audio/hal/pathselect/BUILD.gn +++ b/audio/hal/pathselect/BUILD.gn @@ -59,11 +59,6 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/hal/hdi_passthrough/include", "//drivers/peripheral/audio/hal/pathselect/include", "//third_party/cJSON", - "$hdf_framework_path/include/core", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/utils/include", "$hdf_framework_path/include", "$hdf_framework_path/core/sec/include", "$hdf_framework_path/core/shared/include", @@ -94,27 +89,14 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/hal/pathselect/include", "//third_party/cJSON", "//drivers/peripheral/audio/interfaces/include", - "$hdf_framework_path/include/core", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include", "//third_party/bounds_checking_function/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_uhdf_path/osal/include", ] deps = [ - "$hdf_uhdf_path/config:libhdf_hcs", - "$hdf_uhdf_path/hcs:hdf_default.hcb", "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/host:hdf_devhost", "$hdf_uhdf_path/host:libhdf_host", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/manager:hdf_devmgr", - "$hdf_uhdf_path/manager:hdf_devmgr.rc", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] diff --git a/audio/sample/BUILD.gn b/audio/sample/BUILD.gn index 206ec3194c..0df239bf36 100755 --- a/audio/sample/BUILD.gn +++ b/audio/sample/BUILD.gn @@ -25,11 +25,6 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/interfaces/include", "//drivers/peripheral/audio/hal/hdi_binder/proxy/include", "//utils/native/base/include", - "$hdf_framework_path/include", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", "$hdf_framework_path/core/adapter/syscall/include", "$hdf_framework_path/core/adapter/vnode/include", "$hdf_framework_path/core/shared/include", @@ -37,7 +32,6 @@ if (defined(ohos_lite)) { "$hdf_uhdf_path/osal/include", "$hdf_uhdf_path/include/hdi", "$hdf_uhdf_path/ipc/include", - "$hdf_uhdf_path/include/config", "$hdf_uhdf_path/include/osal", "$hdf_uhdf_path/include/host", "$hdf_uhdf_path/shared/include", @@ -63,25 +57,14 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/interfaces/include", "//drivers/peripheral/audio/hal/hdi_binder/proxy/include", "//utils/native/base/include", - "$hdf_framework_path/include", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", "$hdf_framework_path/core/adapter/syscall/include", "$hdf_framework_path/core/adapter/vnode/include", "$hdf_framework_path/core/shared/include", "$hdf_framework_path/include/core/", - "$hdf_uhdf_path/osal/include", - "$hdf_uhdf_path/include/hdi", - "$hdf_uhdf_path/ipc/include", - "$hdf_uhdf_path/include/config", - "$hdf_uhdf_path/include/osal", "$hdf_uhdf_path/include/host", "$hdf_uhdf_path/shared/include", "$hdf_uhdf_path/manager/include", "$hdf_uhdf_path/host/include", - "$hdf_uhdf_path/include", "$hdf_uhdf_path/common/security/include", "//third_party/bounds_checking_function/include", ] @@ -101,40 +84,15 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/interfaces/include", "//drivers/peripheral/audio/hal/hdi_binder/proxy/include", "//utils/native/base/include", - "$hdf_framework_path/include", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/core/adapter/syscall/include", - "$hdf_framework_path/core/adapter/vnode/include", - "$hdf_framework_path/core/shared/include", - "$hdf_framework_path/include/core/", - "$hdf_uhdf_path/osal/include", - "$hdf_uhdf_path/include/hdi", - "$hdf_uhdf_path/ipc/include", - "$hdf_uhdf_path/include/config", - "$hdf_uhdf_path/include/osal", - "$hdf_uhdf_path/include/host", - "$hdf_uhdf_path/shared/include", - "$hdf_uhdf_path/manager/include", - "$hdf_uhdf_path/host/include", - "$hdf_uhdf_path/include", - "$hdf_uhdf_path/common/security/include", ] sources = [ "framework_render.c" ] deps = [ - "$hdf_uhdf_path/config:libhdf_hcs", - "$hdf_uhdf_path/hcs:hdf_default.hcb", "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/host:hdf_devhost", "$hdf_uhdf_path/host:libhdf_host", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/manager:hdf_devmgr", - "$hdf_uhdf_path/manager:hdf_devmgr.rc", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] @@ -158,40 +116,15 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/interfaces/include", "//drivers/peripheral/audio/hal/hdi_binder/proxy/include", "//utils/native/base/include", - "$hdf_framework_path/include", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/core/adapter/syscall/include", - "$hdf_framework_path/core/adapter/vnode/include", - "$hdf_framework_path/core/shared/include", - "$hdf_framework_path/include/core/", - "$hdf_uhdf_path/osal/include", - "$hdf_uhdf_path/include/hdi", - "$hdf_uhdf_path/ipc/include", - "$hdf_uhdf_path/include/config", - "$hdf_uhdf_path/include/osal", - "$hdf_uhdf_path/include/host", - "$hdf_uhdf_path/shared/include", - "$hdf_uhdf_path/manager/include", - "$hdf_uhdf_path/host/include", - "$hdf_uhdf_path/include", - "$hdf_uhdf_path/common/security/include", ] sources = [ "framework_capture.c" ] deps = [ - "$hdf_uhdf_path/config:libhdf_hcs", - "$hdf_uhdf_path/hcs:hdf_default.hcb", "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/host:hdf_devhost", "$hdf_uhdf_path/host:libhdf_host", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/manager:hdf_devmgr", - "$hdf_uhdf_path/manager:hdf_devmgr.rc", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] diff --git a/audio/supportlibs/adm_adapter/BUILD.gn b/audio/supportlibs/adm_adapter/BUILD.gn index 539545a97f..d9819a27cf 100755 --- a/audio/supportlibs/adm_adapter/BUILD.gn +++ b/audio/supportlibs/adm_adapter/BUILD.gn @@ -51,7 +51,7 @@ config("audio_interface_config") { if (defined(ohos_lite)) { shared_library("hdi_audio_interface_lib_capture") { sources = [ - "$hdf_framework_path/ability/sbuf/src/hdf_sbuf.c", + "$hdf_framework_path/utils/src/hdf_sbuf.c", "//drivers/peripheral/audio/hal/hdi_passthrough/src/audio_common.c", "src/audio_interface_lib_capture.c", "src/audio_interface_lib_common.c", @@ -61,15 +61,7 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/hal/hdi_passthrough/include", "//drivers/peripheral/audio/supportlibs/adm_adapter/include", "//drivers/peripheral/audio/interfaces/include", - "$hdf_framework_path/include/core", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include", "//third_party/bounds_checking_function/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_uhdf_path/osal/include", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/", "//device/hisilicon/hispark_taurus/sdk_linux/huawei_proprietary/include", ] @@ -86,7 +78,7 @@ if (defined(ohos_lite)) { shared_library("hdi_audio_interface_lib_render") { sources = [ - "$hdf_framework_path/ability/sbuf/src/hdf_sbuf.c", + "$hdf_framework_path/utils/src/hdf_sbuf.c", "//drivers/peripheral/audio/hal/hdi_passthrough/src/audio_common.c", "src/audio_interface_lib_common.c", "src/audio_interface_lib_render.c", @@ -96,14 +88,7 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/hal/hdi_passthrough/include", "//drivers/peripheral/audio/supportlibs/adm_adapter/include", "//drivers/peripheral/audio/interfaces/include", - "$hdf_framework_path/include/core", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include", "//third_party/bounds_checking_function/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", "$hdf_uhdf_path/osal/include", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/", "//device/hisilicon/hispark_taurus/sdk_linux/huawei_proprietary/include", @@ -130,28 +115,15 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/hal/hdi_passthrough/include", "//drivers/peripheral/audio/supportlibs/adm_adapter/include", "//drivers/peripheral/audio/interfaces/include", - "$hdf_framework_path/include/core", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include", "//third_party/bounds_checking_function/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_uhdf_path/osal/include", "//device/hisilicon/hispark_taurus/sdk_linux/huawei_proprietary/include", ] deps = [ - "$hdf_uhdf_path/config:libhdf_hcs", - "$hdf_uhdf_path/hcs:hdf_default.hcb", "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/host:hdf_devhost", "$hdf_uhdf_path/host:libhdf_host", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/manager:hdf_devmgr", - "$hdf_uhdf_path/manager:hdf_devmgr.rc", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] @@ -177,28 +149,15 @@ if (defined(ohos_lite)) { "//drivers/peripheral/audio/hal/hdi_passthrough/include", "//drivers/peripheral/audio/supportlibs/adm_adapter/include", "//drivers/peripheral/audio/interfaces/include", - "$hdf_framework_path/include/core", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include", "//third_party/bounds_checking_function/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_uhdf_path/osal/include", "//device/hisilicon/hispark_taurus/sdk_linux/huawei_proprietary/include", ] deps = [ - "$hdf_uhdf_path/config:libhdf_hcs", - "$hdf_uhdf_path/hcs:hdf_default.hcb", "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/host:hdf_devhost", "$hdf_uhdf_path/host:libhdf_host", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/manager:hdf_devmgr", - "$hdf_uhdf_path/manager:hdf_devmgr.rc", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] diff --git a/audio/test/systemtest/adm/audio_adm_interface/BUILD.gn b/audio/test/systemtest/adm/audio_adm_interface/BUILD.gn index ed05aaad23..7988b6171f 100755 --- a/audio/test/systemtest/adm/audio_adm_interface/BUILD.gn +++ b/audio/test/systemtest/adm/audio_adm_interface/BUILD.gn @@ -35,7 +35,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/core", "//drivers/framework/include/utils", "//drivers/framework/include/osal", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", "//drivers/framework/include", "//drivers/framework/core/sec/include", @@ -92,10 +91,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", - "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/adm_common/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//third_party/googletest/googletest/include/gtest", @@ -110,15 +106,10 @@ if (defined(ohos_lite)) { "-fno-strict-aliasing", ] deps = [ - "//drivers/adapter/uhdf2/config:libhdf_hcs", - "//drivers/adapter/uhdf2/hcs:hdf_default.hcb", "//drivers/adapter/uhdf2/hdi:libhdi", - "//drivers/adapter/uhdf2/host:hdf_devhost", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/manager:hdf_devmgr", - "//drivers/adapter/uhdf2/manager:hdf_devmgr.rc", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/audio/test/systemtest/adm_interface_lib/capture/BUILD.gn b/audio/test/systemtest/adm_interface_lib/capture/BUILD.gn index 96b254e001..93ee27d8bc 100755 --- a/audio/test/systemtest/adm_interface_lib/capture/BUILD.gn +++ b/audio/test/systemtest/adm_interface_lib/capture/BUILD.gn @@ -37,7 +37,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/core", "//drivers/framework/include/utils", "//drivers/framework/include/osal", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", "//drivers/framework/include", "//drivers/framework/core/sec/include", @@ -91,9 +90,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include", "//utils/native/base/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/lib_common/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", diff --git a/audio/test/systemtest/adm_interface_lib/render/BUILD.gn b/audio/test/systemtest/adm_interface_lib/render/BUILD.gn index f6e9ba3cac..4dee496749 100755 --- a/audio/test/systemtest/adm_interface_lib/render/BUILD.gn +++ b/audio/test/systemtest/adm_interface_lib/render/BUILD.gn @@ -37,7 +37,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/core", "//drivers/framework/include/utils", "//drivers/framework/include/osal", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", "//drivers/framework/include", "//drivers/framework/core/sec/include", @@ -91,9 +90,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/lib_common/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", diff --git a/audio/test/systemtest/audio_function/audio_pathroute/BUILD.gn b/audio/test/systemtest/audio_function/audio_pathroute/BUILD.gn index 1a4662c3a4..f8d978d42a 100755 --- a/audio/test/systemtest/audio_function/audio_pathroute/BUILD.gn +++ b/audio/test/systemtest/audio_function/audio_pathroute/BUILD.gn @@ -25,7 +25,7 @@ if (defined(ohos_lite)) { unittest("hdf_audio_hdi_path_route_test") { sources = [ "../../common/hdi_common/src/audio_hdi_common.cpp", - "//drivers/framework/ability/sbuf/src/hdf_sbuf.c", + "//drivers/framework/utils/src/hdf_sbuf.c", "src/audio_pathroute_test.cpp", ] @@ -36,7 +36,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/core", "//drivers/framework/include/utils", "//drivers/framework/include/osal", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", "//drivers/framework/include", "//drivers/framework/core/sec/include", @@ -90,9 +89,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//drivers/peripheral/audio/test/systemtest/audio_function/audio_pathroute/include", @@ -107,15 +104,10 @@ if (defined(ohos_lite)) { "-fno-strict-aliasing", ] deps = [ - "//drivers/adapter/uhdf2/config:libhdf_hcs", - "//drivers/adapter/uhdf2/hcs:hdf_default.hcb", "//drivers/adapter/uhdf2/hdi:libhdi", - "//drivers/adapter/uhdf2/host:hdf_devhost", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/manager:hdf_devmgr", - "//drivers/adapter/uhdf2/manager:hdf_devmgr.rc", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/audio/test/systemtest/audio_function/audio_server/BUILD.gn b/audio/test/systemtest/audio_function/audio_server/BUILD.gn index 0db8a98b37..75d27c2fa5 100755 --- a/audio/test/systemtest/audio_function/audio_server/BUILD.gn +++ b/audio/test/systemtest/audio_function/audio_server/BUILD.gn @@ -39,9 +39,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//drivers/peripheral/audio/test/systemtest/audio_function/audio_server/include", @@ -79,9 +77,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//drivers/peripheral/audio/test/systemtest/audio_function/audio_server/include", diff --git a/audio/test/systemtest/audio_function/audio_smartpa/BUILD.gn b/audio/test/systemtest/audio_function/audio_smartpa/BUILD.gn index 2f4445656e..f881332d15 100755 --- a/audio/test/systemtest/audio_function/audio_smartpa/BUILD.gn +++ b/audio/test/systemtest/audio_function/audio_smartpa/BUILD.gn @@ -41,9 +41,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//drivers/peripheral/audio/test/systemtest/audio_function/audio_smartpa/include", @@ -96,9 +94,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//drivers/peripheral/audio/test/systemtest/audio_function/audio_smartpa/include", @@ -117,15 +113,10 @@ if (defined(ohos_lite)) { "-fno-strict-aliasing", ] deps = [ - "//drivers/adapter/uhdf2/config:libhdf_hcs", - "//drivers/adapter/uhdf2/hcs:hdf_default.hcb", "//drivers/adapter/uhdf2/hdi:libhdi", - "//drivers/adapter/uhdf2/host:hdf_devhost", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/manager:hdf_devmgr", - "//drivers/adapter/uhdf2/manager:hdf_devmgr.rc", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/audio/test/systemtest/hdi/adapter/BUILD.gn b/audio/test/systemtest/hdi/adapter/BUILD.gn index 4d0c0a56e7..aa4fc238f5 100755 --- a/audio/test/systemtest/hdi/adapter/BUILD.gn +++ b/audio/test/systemtest/hdi/adapter/BUILD.gn @@ -35,7 +35,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/core", "//drivers/framework/include/utils", "//drivers/framework/include/osal", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", "//drivers/framework/include", "//drivers/framework/core/sec/include", @@ -83,9 +82,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include/utils", "//drivers/framework/include/osal", "//drivers/framework/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//third_party/bounds_checking_function/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//third_party/googletest/googletest/include/gtest", diff --git a/audio/test/systemtest/hdi/capture/BUILD.gn b/audio/test/systemtest/hdi/capture/BUILD.gn index 4749f1cb34..5a4416af28 100755 --- a/audio/test/systemtest/hdi/capture/BUILD.gn +++ b/audio/test/systemtest/hdi/capture/BUILD.gn @@ -35,7 +35,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/core", "//drivers/framework/include/utils", "//drivers/framework/include/osal", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", "//drivers/framework/include", "//drivers/framework/core/sec/include", @@ -76,7 +75,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/core", "//drivers/framework/include/utils", "//drivers/framework/include/osal", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", "//drivers/framework/include", "//drivers/framework/core/sec/include", @@ -117,7 +115,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/core", "//drivers/framework/include/utils", "//drivers/framework/include/osal", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", "//drivers/framework/include", "//drivers/framework/core/sec/include", @@ -158,7 +155,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/core", "//drivers/framework/include/utils", "//drivers/framework/include/osal", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", "//drivers/framework/include", "//drivers/framework/core/sec/include", @@ -199,7 +195,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/core", "//drivers/framework/include/utils", "//drivers/framework/include/osal", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", "//drivers/framework/include", "//drivers/framework/core/sec/include", @@ -247,9 +242,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//third_party/googletest/googletest/include/gtest", @@ -302,9 +295,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//third_party/googletest/googletest/include/gtest", @@ -357,9 +348,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//third_party/googletest/googletest/include/gtest", @@ -412,9 +401,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//third_party/googletest/googletest/include/gtest", @@ -467,9 +454,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//third_party/googletest/googletest/include/gtest", diff --git a/audio/test/systemtest/hdi/hdiperformace/BUILD.gn b/audio/test/systemtest/hdi/hdiperformace/BUILD.gn index 7520293e6e..a04aca8918 100755 --- a/audio/test/systemtest/hdi/hdiperformace/BUILD.gn +++ b/audio/test/systemtest/hdi/hdiperformace/BUILD.gn @@ -35,7 +35,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/core", "//drivers/framework/include/utils", "//drivers/framework/include/osal", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", "//drivers/framework/include", "//drivers/framework/core/sec/include", @@ -76,7 +75,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/core", "//drivers/framework/include/utils", "//drivers/framework/include/osal", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", "//drivers/framework/include", "//drivers/framework/core/sec/include", @@ -124,9 +122,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//third_party/googletest/googletest/include/gtest", @@ -179,9 +175,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//third_party/googletest/googletest/include/gtest", diff --git a/audio/test/systemtest/hdi/hdireliability/BUILD.gn b/audio/test/systemtest/hdi/hdireliability/BUILD.gn index 48d1c9e6fd..6c9e1ed8f3 100755 --- a/audio/test/systemtest/hdi/hdireliability/BUILD.gn +++ b/audio/test/systemtest/hdi/hdireliability/BUILD.gn @@ -35,7 +35,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/core", "//drivers/framework/include/utils", "//drivers/framework/include/osal", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", "//drivers/framework/include", "//drivers/framework/core/sec/include", @@ -79,7 +78,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/core", "//drivers/framework/include/utils", "//drivers/framework/include/osal", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", "//drivers/framework/include", "//drivers/framework/core/sec/include", @@ -114,7 +112,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/core", "//drivers/framework/include/utils", "//drivers/framework/include/osal", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", "//drivers/framework/include", "//drivers/framework/core/sec/include", @@ -149,7 +146,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/core", "//drivers/framework/include/utils", "//drivers/framework/include/osal", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", "//drivers/framework/include", "//drivers/framework/core/sec/include", @@ -192,9 +188,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include", "//third_party/bounds_checking_function/include", "//utils/native/base/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//third_party/googletest/googletest/include/gtest", @@ -249,9 +243,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include", "//third_party/bounds_checking_function/include", "//utils/native/base/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//third_party/googletest/googletest/include/gtest", @@ -306,9 +298,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include", "//third_party/bounds_checking_function/include", "//utils/native/base/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//third_party/googletest/googletest/include/gtest", @@ -363,9 +353,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include", "//third_party/bounds_checking_function/include", "//utils/native/base/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//third_party/googletest/googletest/include/gtest", diff --git a/audio/test/systemtest/hdi/render/BUILD.gn b/audio/test/systemtest/hdi/render/BUILD.gn index 89560210ba..31c324cae0 100755 --- a/audio/test/systemtest/hdi/render/BUILD.gn +++ b/audio/test/systemtest/hdi/render/BUILD.gn @@ -35,7 +35,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/core", "//drivers/framework/include/utils", "//drivers/framework/include/osal", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", "//drivers/framework/include", "//drivers/framework/core/sec/include", @@ -76,7 +75,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/core", "//drivers/framework/include/utils", "//drivers/framework/include/osal", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", "//drivers/framework/include", "//drivers/framework/core/sec/include", @@ -117,7 +115,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/core", "//drivers/framework/include/utils", "//drivers/framework/include/osal", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", "//drivers/framework/include", "//drivers/framework/core/sec/include", @@ -158,7 +155,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/core", "//drivers/framework/include/utils", "//drivers/framework/include/osal", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", "//drivers/framework/include", "//drivers/framework/core/sec/include", @@ -199,7 +195,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/core", "//drivers/framework/include/utils", "//drivers/framework/include/osal", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", "//drivers/framework/include", "//drivers/framework/core/sec/include", @@ -247,9 +242,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//third_party/googletest/googletest/include/gtest", @@ -302,9 +295,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//third_party/googletest/googletest/include/gtest", @@ -357,9 +348,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//third_party/googletest/googletest/include/gtest", @@ -412,9 +401,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//third_party/googletest/googletest/include/gtest", @@ -467,9 +454,7 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//drivers/peripheral/audio/test/systemtest/common/hdi_common/include", "//third_party/googletest/googletest/include/gtest", diff --git a/audio/test/unittest/adm/BUILD.gn b/audio/test/unittest/adm/BUILD.gn index eae60faba0..ac079eab94 100755 --- a/audio/test/unittest/adm/BUILD.gn +++ b/audio/test/unittest/adm/BUILD.gn @@ -18,13 +18,11 @@ ohos_unittest("hdf_audio_adm_test") { module_out_path = module_output_path include_dirs = [ - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/include/osal", "//drivers/adapter/uhdf/posix/include", "//drivers/framework/include/utils", - "//drivers/framework/include/config", "//drivers/framework/include", "//drivers/framework/test/unittest/include", "//drivers/framework/test/unittest/osal", @@ -41,8 +39,8 @@ ohos_unittest("hdf_audio_adm_test") { "//drivers/framework/model/audio/sapm/test/unittest/common/audio_sapm_test.cpp", ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", "//drivers/adapter/uhdf2/test/unittest/common:libhdf_test_common", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//utils/native/base:utils", ] diff --git a/audio/test/unittest/driver/BUILD.gn b/audio/test/unittest/driver/BUILD.gn index 827478df70..413dea5d7a 100755 --- a/audio/test/unittest/driver/BUILD.gn +++ b/audio/test/unittest/driver/BUILD.gn @@ -18,13 +18,11 @@ ohos_unittest("khdf_audio_driver_test") { module_out_path = module_output_path include_dirs = [ - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/include/osal", "//drivers/adapter/uhdf/posix/include", "//drivers/framework/include/utils", - "//drivers/framework/include/config", "//drivers/framework/include", "//drivers/framework/test/unittest/include", "//drivers/framework/test/unittest/osal", @@ -40,8 +38,8 @@ ohos_unittest("khdf_audio_driver_test") { "//drivers/peripheral/audio/chipsets/hi3516dv300/soc/test/unittest/common/hi3516_platform_ops_test.cpp", ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", "//drivers/adapter/uhdf2/test/unittest/common:libhdf_test_common", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//utils/native/base:utils", ] diff --git a/audio/test/unittest/hdi/adapter/BUILD.gn b/audio/test/unittest/hdi/adapter/BUILD.gn index 16b1fc4d4b..f2b0176ea5 100755 --- a/audio/test/unittest/hdi/adapter/BUILD.gn +++ b/audio/test/unittest/hdi/adapter/BUILD.gn @@ -38,15 +38,13 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//third_party/googletest/googletest/include/gtest", ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -83,15 +81,13 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//third_party/googletest/googletest/include/gtest", ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", diff --git a/audio/test/unittest/hdi/capture/BUILD.gn b/audio/test/unittest/hdi/capture/BUILD.gn index 5e48aa0389..340a813bf2 100755 --- a/audio/test/unittest/hdi/capture/BUILD.gn +++ b/audio/test/unittest/hdi/capture/BUILD.gn @@ -38,15 +38,13 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//third_party/googletest/googletest/include/gtest", ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -83,15 +81,13 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//third_party/googletest/googletest/include/gtest", ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", diff --git a/audio/test/unittest/hdi/manager/BUILD.gn b/audio/test/unittest/hdi/manager/BUILD.gn index b0cd40bb5b..2c5cbcab61 100755 --- a/audio/test/unittest/hdi/manager/BUILD.gn +++ b/audio/test/unittest/hdi/manager/BUILD.gn @@ -38,15 +38,13 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//third_party/googletest/googletest/include/gtest", ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -83,15 +81,13 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//third_party/googletest/googletest/include/gtest", ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", diff --git a/audio/test/unittest/hdi/render/BUILD.gn b/audio/test/unittest/hdi/render/BUILD.gn index b7ce05b89a..2185a8ef8c 100755 --- a/audio/test/unittest/hdi/render/BUILD.gn +++ b/audio/test/unittest/hdi/render/BUILD.gn @@ -38,15 +38,13 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//third_party/googletest/googletest/include/gtest", ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -83,15 +81,13 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//third_party/googletest/googletest/include/gtest", ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", diff --git a/audio/test/unittest/lib/interface_lib_capture/BUILD.gn b/audio/test/unittest/lib/interface_lib_capture/BUILD.gn index bab028c221..a49d9f1434 100755 --- a/audio/test/unittest/lib/interface_lib_capture/BUILD.gn +++ b/audio/test/unittest/lib/interface_lib_capture/BUILD.gn @@ -38,15 +38,13 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//third_party/googletest/googletest/include/gtest", ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] @@ -86,15 +84,13 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//third_party/googletest/googletest/include/gtest", ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] diff --git a/audio/test/unittest/lib/interface_lib_render/BUILD.gn b/audio/test/unittest/lib/interface_lib_render/BUILD.gn index 9bcb722803..8a704e413c 100755 --- a/audio/test/unittest/lib/interface_lib_render/BUILD.gn +++ b/audio/test/unittest/lib/interface_lib_render/BUILD.gn @@ -38,15 +38,13 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//third_party/googletest/googletest/include/gtest", ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] @@ -86,15 +84,13 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/adapter/uhdf2/osal/include", "//third_party/googletest/googletest/include/gtest", ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] diff --git a/camera/hal/adapter/chipset/hispark_taurus/src/pipeline_core/BUILD.gn b/camera/hal/adapter/chipset/hispark_taurus/src/pipeline_core/BUILD.gn index 3e2166b9bb..3c6aaa90aa 100644 --- a/camera/hal/adapter/chipset/hispark_taurus/src/pipeline_core/BUILD.gn +++ b/camera/hal/adapter/chipset/hispark_taurus/src/pipeline_core/BUILD.gn @@ -108,12 +108,9 @@ ohos_shared_library("camera_pipeline_core") { "//foundation/multimedia/camera_standard/frameworks/innerkitsimpl/metadata/include", # hcs parser - "//drivers/framework/include/config", "//drivers/framework/include/osal", "//drivers/framework/include/utils", - "//drivers/adapter/uhdf2/include/config", "//drivers/adapter/uhdf2/osal/include", - "//drivers/framework/ability/config/hcs_parser/include", "//system/core/include/cutils", "//drivers/framework/utils/include", "//drivers/adapter/uhdf2/osal/include", @@ -125,8 +122,7 @@ ohos_shared_library("camera_pipeline_core") { "//foundation/multimedia/camera_standard/frameworks/innerkitsimpl/metadata:metadata", # hcs parser - "$hdf_uhdf_path/config:libhdf_hcs", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//foundation/graphic/standard:libsurface", ] diff --git a/camera/hal/adapter/chipset/rpi3/src/driver_adapter/main_test/BUILD.gn b/camera/hal/adapter/chipset/rpi3/src/driver_adapter/main_test/BUILD.gn index 68ecbf1b9a..048c9adc8e 100644 --- a/camera/hal/adapter/chipset/rpi3/src/driver_adapter/main_test/BUILD.gn +++ b/camera/hal/adapter/chipset/rpi3/src/driver_adapter/main_test/BUILD.gn @@ -46,7 +46,6 @@ ohos_executable("v4l2_main") { include_dirs = [ "$camera_path/include", - "//drivers/adapter/uhdf2/include/config", "//drivers/adapter/uhdf2/osal/include", "//drivers/framework/include/utils", "//drivers/peripheral/camera/hal/adapter/platform/v4l2/src/driver_adapter/include", diff --git a/camera/hal/adapter/platform/v4l2/src/driver_adapter/BUILD.gn b/camera/hal/adapter/platform/v4l2/src/driver_adapter/BUILD.gn index 07179458da..c99346376d 100644 --- a/camera/hal/adapter/platform/v4l2/src/driver_adapter/BUILD.gn +++ b/camera/hal/adapter/platform/v4l2/src/driver_adapter/BUILD.gn @@ -53,7 +53,6 @@ ohos_shared_library("camera_v4l2_adapter") { include_dirs = [ "$camera_path/include", - "//drivers/adapter/uhdf2/include/config", "//drivers/adapter/uhdf2/osal/include", "//drivers/framework/include/utils", "//drivers/peripheral/camera/hal/adapter/platform/v4l2/src/driver_adapter/include", diff --git a/camera/hal/adapter/platform/v4l2/src/pipeline_core/BUILD.gn b/camera/hal/adapter/platform/v4l2/src/pipeline_core/BUILD.gn index aa944efc14..acecd587bf 100644 --- a/camera/hal/adapter/platform/v4l2/src/pipeline_core/BUILD.gn +++ b/camera/hal/adapter/platform/v4l2/src/pipeline_core/BUILD.gn @@ -102,12 +102,9 @@ ohos_shared_library("camera_pipeline_core") { "//foundation/multimedia/camera_standard/frameworks/innerkitsimpl/metadata/include", # hcs parser - "//drivers/framework/include/config", "//drivers/framework/include/osal", "//drivers/framework/include/utils", - "//drivers/adapter/uhdf2/include/config", "//drivers/adapter/uhdf2/osal/include", - "//drivers/framework/ability/config/hcs_parser/include", "//system/core/include/cutils", "//drivers/framework/utils/include", "//drivers/adapter/uhdf2/osal/include", @@ -119,8 +116,7 @@ ohos_shared_library("camera_pipeline_core") { "//foundation/multimedia/camera_standard/frameworks/innerkitsimpl/metadata:metadata", # hcs parser - "$hdf_uhdf_path/config:libhdf_hcs", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//foundation/graphic/standard:libsurface", ] diff --git a/camera/hal/hdi_impl/BUILD.gn b/camera/hal/hdi_impl/BUILD.gn index cbd07aac66..fac65920a6 100644 --- a/camera/hal/hdi_impl/BUILD.gn +++ b/camera/hal/hdi_impl/BUILD.gn @@ -106,16 +106,12 @@ ohos_shared_library("camera_hdi_impl") { "$camera_path/pipeline_core/ipp/include", # HCS文件解析需要 - "//drivers/framework/include/config", "//drivers/framework/include/osal", "//drivers/framework/include/utils", - "//drivers/adapter/uhdf2/include/config", "//drivers/adapter/uhdf2/osal/include", - "//drivers/framework/ability/config/hcs_parser/include", "//system/core/include/cutils", "$hdf_uhdf_path/manager/include", "$hdf_uhdf_path/include/hdi", - "$hdf_framework_path/ability/sbuf/include", ] if (use_hitrace) { @@ -132,9 +128,8 @@ ohos_shared_library("camera_hdi_impl") { "$camera_path/device_manager:camera_device_manager", "$camera_path/pipeline_core:camera_pipeline_core", "$camera_path/utils:camera_utils", - "$hdf_uhdf_path/config:libhdf_hcs", "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", diff --git a/camera/hal/hdi_impl/test/BUILD.gn b/camera/hal/hdi_impl/test/BUILD.gn index 65644c5dd8..7f56d7afbe 100644 --- a/camera/hal/hdi_impl/test/BUILD.gn +++ b/camera/hal/hdi_impl/test/BUILD.gn @@ -98,14 +98,10 @@ ohos_unittest("hdi_impl_unittest") { "$camera_path/pipeline_core/ipp/include", # HCS - "//drivers/framework/include/config", "//drivers/framework/include/osal", "//drivers/framework/include/utils", - "//drivers/adapter/uhdf2/include/config", - "//drivers/framework/ability/config/hcs_parser/include", "//system/core/include/cutils", "//drivers/adapter/uhdf2/osal/include", - "$hdf_framework_path/ability/sbuf/include", "$hdf_uhdf_path/manager/include", "$hdf_uhdf_path/include/hdi", @@ -119,9 +115,8 @@ ohos_unittest("hdi_impl_unittest") { "$camera_path/device_manager:camera_device_manager", "$camera_path/hdi_impl:camera_hdi_impl", "$camera_path/pipeline_core:camera_pipeline_core", - "$hdf_uhdf_path/config:libhdf_hcs", "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "../../../interfaces/include/client:libcamera_client", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", diff --git a/camera/hal/init/BUILD.gn b/camera/hal/init/BUILD.gn index c77dfeb9e4..26fd98ef1b 100644 --- a/camera/hal/init/BUILD.gn +++ b/camera/hal/init/BUILD.gn @@ -58,14 +58,10 @@ ohos_executable("ohos_camera_demo") { "$camera_path/pipeline_core/ipp/include", # HCS - "//drivers/framework/include/config", "//drivers/framework/include/osal", "//drivers/framework/include/utils", - "//drivers/adapter/uhdf2/include/config", "//drivers/adapter/uhdf2/osal/include", - "//drivers/framework/ability/config/hcs_parser/include", "//system/core/include/cutils", - "$hdf_framework_path/ability/sbuf/include", "$hdf_uhdf_path/manager/include", "$hdf_uhdf_path/include/hdi", "$hdf_uhdf_path/devhost/include", @@ -79,9 +75,8 @@ ohos_executable("ohos_camera_demo") { "$camera_path/device_manager:camera_device_manager", "$camera_path/hdi_impl:camera_hdi_impl", "$camera_path/pipeline_core:camera_pipeline_core", - "$hdf_uhdf_path/config:libhdf_hcs", "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", "//drivers/peripheral/display/hal:hdi_display_gralloc", diff --git a/camera/hal/pipeline_core/test/BUILD.gn b/camera/hal/pipeline_core/test/BUILD.gn index 4bc4095c40..0fd7fb7afc 100644 --- a/camera/hal/pipeline_core/test/BUILD.gn +++ b/camera/hal/pipeline_core/test/BUILD.gn @@ -93,11 +93,8 @@ ohos_unittest("pipeline_core_unittest") { "//foundation/multimedia/camera_standard/frameworks/innerkitsimpl/metadata/include", # hcs parser - "//drivers/framework/include/config", "//drivers/framework/include/osal", "//drivers/framework/include/utils", - "//drivers/adapter/uhdf2/include/config", - "//drivers/framework/ability/config/hcs_parser/include", "//system/core/include/cutils", "//drivers/framework/utils/include", "//drivers/adapter/uhdf2/osal/include", @@ -121,8 +118,7 @@ ohos_unittest("pipeline_core_unittest") { "//foundation/multimedia/camera_standard/frameworks/innerkitsimpl/metadata:metadata", # hcs parser - "$hdf_uhdf_path/config:libhdf_hcs", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//foundation/graphic/standard:libsurface", "//third_party/googletest:gmock_main", diff --git a/camera/hal/test/fuzz/BUILD.gn b/camera/hal/test/fuzz/BUILD.gn index df5f823a66..6d2b30997c 100644 --- a/camera/hal/test/fuzz/BUILD.gn +++ b/camera/hal/test/fuzz/BUILD.gn @@ -67,9 +67,8 @@ ohos_fuzztest("IPCCameraDeviceRemote_fuzzer") { "$camera_path/device_manager:camera_device_manager", "$camera_path/hdi_impl:camera_hdi_impl", "$camera_path/pipeline_core:camera_pipeline_core", - "$hdf_uhdf_path/config:libhdf_hcs", "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", "//drivers/peripheral/display/hal:hdi_display_gralloc", @@ -140,9 +139,8 @@ ohos_fuzztest("IPCCameraHostService_fuzzer") { "$camera_path/device_manager:camera_device_manager", "$camera_path/hdi_impl:camera_hdi_impl", "$camera_path/pipeline_core:camera_pipeline_core", - "$hdf_uhdf_path/config:libhdf_hcs", "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", "//drivers/peripheral/display/hal:hdi_display_gralloc", @@ -213,9 +211,8 @@ ohos_fuzztest("IPCOffline_fuzzer") { "$camera_path/device_manager:camera_device_manager", "$camera_path/hdi_impl:camera_hdi_impl", "$camera_path/pipeline_core:camera_pipeline_core", - "$hdf_uhdf_path/config:libhdf_hcs", "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", "//drivers/peripheral/display/hal:hdi_display_gralloc", @@ -286,9 +283,8 @@ ohos_fuzztest("IPCStreamOperator_fuzzer") { "$camera_path/device_manager:camera_device_manager", "$camera_path/hdi_impl:camera_hdi_impl", "$camera_path/pipeline_core:camera_pipeline_core", - "$hdf_uhdf_path/config:libhdf_hcs", "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", "//drivers/peripheral/display/hal:hdi_display_gralloc", @@ -360,9 +356,8 @@ ohos_fuzztest("IPCCameraDeviceCallback_fuzzer") { "$camera_path/device_manager:camera_device_manager", "$camera_path/hdi_impl:camera_hdi_impl", "$camera_path/pipeline_core:camera_pipeline_core", - "$hdf_uhdf_path/config:libhdf_hcs", "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", "//drivers/peripheral/display/hal:hdi_display_gralloc", @@ -434,9 +429,8 @@ ohos_fuzztest("IPCCameraHostCallback_fuzzer") { "$camera_path/device_manager:camera_device_manager", "$camera_path/hdi_impl:camera_hdi_impl", "$camera_path/pipeline_core:camera_pipeline_core", - "$hdf_uhdf_path/config:libhdf_hcs", "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", "//drivers/peripheral/display/hal:hdi_display_gralloc", @@ -509,9 +503,8 @@ ohos_fuzztest("IPCStreamOperatorCallback_fuzzer") { "$camera_path/device_manager:camera_device_manager", "$camera_path/hdi_impl:camera_hdi_impl", "$camera_path/pipeline_core:camera_pipeline_core", - "$hdf_uhdf_path/config:libhdf_hcs", "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", "//drivers/peripheral/display/hal:hdi_display_gralloc", diff --git a/camera/hal/test/mpi/BUILD.gn b/camera/hal/test/mpi/BUILD.gn index 38097a2714..6f52d673da 100644 --- a/camera/hal/test/mpi/BUILD.gn +++ b/camera/hal/test/mpi/BUILD.gn @@ -92,14 +92,10 @@ ohos_unittest("camera_case_unittest") { "$camera_path/pipeline_core/ipp/include", # HCS文件解析需要 - "//drivers/framework/include/config", "//drivers/framework/include/osal", "//drivers/framework/include/utils", - "//drivers/adapter/uhdf2/include/config", "//drivers/adapter/uhdf2/osal/include", - "//drivers/framework/ability/config/hcs_parser/include", "//system/core/include/cutils", - "$hdf_framework_path/ability/sbuf/include", "$hdf_uhdf_path/manager/include", "$hdf_uhdf_path/include/hdi", ] @@ -110,9 +106,8 @@ ohos_unittest("camera_case_unittest") { "$camera_path/device_manager:camera_device_manager", "$camera_path/hdi_impl:camera_hdi_impl", "$camera_path/pipeline_core:camera_pipeline_core", - "$hdf_uhdf_path/config:libhdf_hcs", "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//foundation/graphic/standard:libsurface", "//foundation/multimedia/camera_standard/frameworks/innerkitsimpl/metadata:metadata", diff --git a/camera/hal_c/hdi_cif/BUILD.gn b/camera/hal_c/hdi_cif/BUILD.gn index 609bd393b4..6e2d2cdbbd 100644 --- a/camera/hal_c/hdi_cif/BUILD.gn +++ b/camera/hal_c/hdi_cif/BUILD.gn @@ -73,7 +73,7 @@ ohos_shared_library("hdi_cif") { deps = [ "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", diff --git a/camera/interfaces/include/client/BUILD.gn b/camera/interfaces/include/client/BUILD.gn index a9ee203945..3b02db9570 100644 --- a/camera/interfaces/include/client/BUILD.gn +++ b/camera/interfaces/include/client/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/ohos.gni") import("//drivers/adapter/uhdf2/uhdf.gni") @@ -21,7 +21,6 @@ group("camera_client") { ohos_shared_library("libcamera_client") { include_dirs = [ "../", - "$hdf_framework_path/ability/sbuf/include", "$hdf_uhdf_path/manager/include", "$hdf_uhdf_path/include/hdi", "//foundation/multimedia/camera_standard/frameworks/innerkitsimpl/metadata/include", @@ -49,7 +48,7 @@ ohos_shared_library("libcamera_client") { "$hdf_uhdf_path/hdi:libhdi", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", "//foundation/graphic/standard:libsurface", "//foundation/multimedia/camera_standard/frameworks/innerkitsimpl/metadata:metadata", diff --git a/codec/hdi_service/BUILD.gn b/codec/hdi_service/BUILD.gn index eef9b6f565..0905eccc97 100755 --- a/codec/hdi_service/BUILD.gn +++ b/codec/hdi_service/BUILD.gn @@ -28,7 +28,7 @@ ohos_shared_library("libcodec_client") { "//drivers/adapter/uhdf2/hdi:libhdi", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", ] if (is_standard_system) { @@ -67,7 +67,7 @@ ohos_shared_library("libcodec_server") { "//drivers/adapter/uhdf2/hdi:libhdi", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/codec/hdi_service:codec_client", ] diff --git a/codec/hdi_service/codec_test/BUILD.gn b/codec/hdi_service/codec_test/BUILD.gn index 645c6b736a..0d8f6ee3b6 100755 --- a/codec/hdi_service/codec_test/BUILD.gn +++ b/codec/hdi_service/codec_test/BUILD.gn @@ -34,7 +34,7 @@ ohos_unittest("codec_test") { ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/codec/hdi_service:codec_client", "//drivers/peripheral/codec/hdi_service:codec_service", "//third_party/googletest:gtest_main", diff --git a/display/hal/default/BUILD.gn b/display/hal/default/BUILD.gn index 4e26d9223f..6351fbde60 100644 --- a/display/hal/default/BUILD.gn +++ b/display/hal/default/BUILD.gn @@ -24,7 +24,6 @@ shared_library("display_layer") { "//drivers/peripheral/display/interfaces/include", "//drivers/adapter/uhdf/posix/include", "//drivers/framework/include/utils", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/utils/include", "//drivers/framework/include/core", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", diff --git a/display/interfaces/hdi_cpp/client/BUILD.gn b/display/interfaces/hdi_cpp/client/BUILD.gn index efedbf5838..62badc26eb 100644 --- a/display/interfaces/hdi_cpp/client/BUILD.gn +++ b/display/interfaces/hdi_cpp/client/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/ohos.gni") import("//drivers/adapter/uhdf2/uhdf.gni") @@ -33,7 +33,7 @@ if (is_standard_system) { "$hdf_uhdf_path/hdi:libhdi", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//foundation/graphic/standard/utils:buffer_handle", ] diff --git a/display/interfaces/hdi_cpp/server/BUILD.gn b/display/interfaces/hdi_cpp/server/BUILD.gn index 483e0bb7c6..476a299c9f 100644 --- a/display/interfaces/hdi_cpp/server/BUILD.gn +++ b/display/interfaces/hdi_cpp/server/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/ohos.gni") import("//drivers/adapter/uhdf2/uhdf.gni") @@ -37,7 +37,7 @@ if (is_standard_system) { "$hdf_uhdf_path/hdi:libhdi", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/display/hal:hdi_display_gralloc", "//foundation/graphic/standard/utils:buffer_handle", ] diff --git a/display/test/unittest/BUILD.gn b/display/test/unittest/BUILD.gn index 8849727831..0dcd27b149 100644 --- a/display/test/unittest/BUILD.gn +++ b/display/test/unittest/BUILD.gn @@ -19,13 +19,11 @@ unittest("hdf_peripheral_display_test") { include_dirs = [ "//third_party/googletest/googletest/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/include/osal", "//drivers/adapter/uhdf/posix/include", "//drivers/framework/include/utils", - "//drivers/framework/include/config", "//drivers/framework/include", "//drivers/framework/test/unittest/include", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", diff --git a/input/hal/BUILD.gn b/input/hal/BUILD.gn index e086149454..63067d6c50 100644 --- a/input/hal/BUILD.gn +++ b/input/hal/BUILD.gn @@ -35,7 +35,6 @@ if (defined(ohos_lite)) { "$HDF_FWKS/include/osal", "$HDF_FWKS/core/adapter/syscall/include", "$HDF_FWKS/include/core", - "$HDF_FWKS/ability/sbuf/include", "$HDF_FWKS/core/shared/include", "$HDF_FWKS/utils/include", "//third_party/bounds_checking_function/include", @@ -84,7 +83,7 @@ if (defined(ohos_lite)) { public_configs = [ ":input_hdi_public_config" ] include_dirs = [ "$INPUT_ROOT_DIR/hal/include" ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//utils/native/base:utils", ] diff --git a/input/test/unittest/BUILD.gn b/input/test/unittest/BUILD.gn index d4fdb45afc..81921c25b9 100644 --- a/input/test/unittest/BUILD.gn +++ b/input/test/unittest/BUILD.gn @@ -27,13 +27,11 @@ if (defined(ohos_lite)) { include_dirs = [ "//third_party/googletest/googletest/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/include/osal", "//drivers/adapter/uhdf/posix/include", "//drivers/framework/include/utils", - "//drivers/framework/include/config", "//drivers/framework/include", "//drivers/framework/test/unittest/include", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", @@ -86,8 +84,8 @@ if (defined(ohos_lite)) { "-fno-strict-aliasing", ] deps = [ - "$hdf_uhdf_path/osal:libhdf_utils", "$hdf_uhdf_path/test/unittest/common:libhdf_test_common", + "$hdf_uhdf_path/utils:libhdf_utils", "//drivers/peripheral/input/hal:hdi_input", "//utils/native/base:utils", ] diff --git a/input/udriver/BUILD.gn b/input/udriver/BUILD.gn index 03facca99d..41113ea12f 100644 --- a/input/udriver/BUILD.gn +++ b/input/udriver/BUILD.gn @@ -25,7 +25,7 @@ ohos_shared_library("libhdf_input_hotplug") { deps = [ "//drivers/adapter/uhdf2/host:libhdf_host", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//utils/native/base:utils", ] diff --git a/misc/vibrator/hal/BUILD.gn b/misc/vibrator/hal/BUILD.gn index 5f3af3e116..8328f16e03 100644 --- a/misc/vibrator/hal/BUILD.gn +++ b/misc/vibrator/hal/BUILD.gn @@ -33,7 +33,6 @@ if (defined(ohos_lite)) { "$FWK_ROOT_DIR/include/utils", "$FWK_ROOT_DIR/include/osal", "$FWK_ROOT_DIR/include/core", - "$FWK_ROOT_DIR/ability/sbuf/include", "//drivers/adapter/uhdf/posix/include", "//third_party/bounds_checking_function/include", ] @@ -74,7 +73,7 @@ if (defined(ohos_lite)) { ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//utils/native/base:utils", ] diff --git a/misc/vibrator/test/performance/BUILD.gn b/misc/vibrator/test/performance/BUILD.gn index f08cb93908..624fbb328a 100644 --- a/misc/vibrator/test/performance/BUILD.gn +++ b/misc/vibrator/test/performance/BUILD.gn @@ -26,7 +26,6 @@ if (defined(ohos_lite)) { output_dir = "$root_out_dir/test/unittest/hdf" include_dirs = [ "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/include/osal", @@ -70,7 +69,7 @@ if (defined(ohos_lite)) { "-fno-strict-aliasing", ] deps = [ - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//drivers/peripheral/misc/vibrator/hal:hdi_vibrator", "//utils/native/base:utils", ] diff --git a/misc/vibrator/test/unittest/BUILD.gn b/misc/vibrator/test/unittest/BUILD.gn index b40e981196..ebde0aff94 100644 --- a/misc/vibrator/test/unittest/BUILD.gn +++ b/misc/vibrator/test/unittest/BUILD.gn @@ -26,7 +26,6 @@ if (defined(ohos_lite)) { output_dir = "$root_out_dir/test/unittest/hdf" include_dirs = [ "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/include/osal", @@ -70,7 +69,7 @@ if (defined(ohos_lite)) { "-fno-strict-aliasing", ] deps = [ - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//drivers/peripheral/misc/vibrator/hal:hdi_vibrator", "//utils/native/base:utils", ] diff --git a/sensor/hal/BUILD.gn b/sensor/hal/BUILD.gn index 4a6b7b6932..900ae778f0 100644 --- a/sensor/hal/BUILD.gn +++ b/sensor/hal/BUILD.gn @@ -36,7 +36,6 @@ if (defined(ohos_lite)) { "$FWK_ROOT_DIR/include/utils", "$FWK_ROOT_DIR/include/osal", "$FWK_ROOT_DIR/include/core", - "$FWK_ROOT_DIR/ability/sbuf/include", "//drivers/adapter/uhdf/posix/include", "//third_party/bounds_checking_function/include", ] @@ -90,7 +89,7 @@ if (defined(ohos_lite)) { ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//utils/native/base:utils", ] defines = [ "__OHOS__USER__" ] diff --git a/sensor/test/performance/BUILD.gn b/sensor/test/performance/BUILD.gn index f6482d042b..d406d8b261 100644 --- a/sensor/test/performance/BUILD.gn +++ b/sensor/test/performance/BUILD.gn @@ -18,7 +18,6 @@ unittest("hdf_peripheral_sensor_test_performance") { output_dir = "$root_out_dir/test/unittest/hdf" include_dirs = [ "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/include/osal", diff --git a/sensor/test/unittest/BUILD.gn b/sensor/test/unittest/BUILD.gn index 25832be5c5..42e3b23471 100644 --- a/sensor/test/unittest/BUILD.gn +++ b/sensor/test/unittest/BUILD.gn @@ -26,7 +26,6 @@ if (defined(ohos_lite)) { output_dir = "$root_out_dir/test/unittest/hdf" include_dirs = [ "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/include/osal", @@ -76,7 +75,7 @@ if (defined(ohos_lite)) { "-fno-strict-aliasing", ] deps = [ - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//drivers/peripheral/sensor/hal:hdi_sensor", "//utils/native/base:utils", ] diff --git a/usb/ddk/BUILD.gn b/usb/ddk/BUILD.gn index 026ee42e08..0aeb6338a7 100755 --- a/usb/ddk/BUILD.gn +++ b/usb/ddk/BUILD.gn @@ -23,12 +23,6 @@ group("libusb_core") { ohos_shared_library("libusb_ddk_host") { include_dirs = [ - "$hdf_framework_path/include/config", - "$hdf_framework_path/ability/config/hcs_parser/include", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/include/core", - "$hdf_uhdf_path/include/host", "device/include", "host/include", "//drivers/peripheral/usb/interfaces/ddk/common", @@ -45,8 +39,8 @@ ohos_shared_library("libusb_ddk_host") { ] deps = [ - "$hdf_uhdf_path/config:uhdf_hcs_pkg", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/host:libhdf_host", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] @@ -61,12 +55,6 @@ ohos_shared_library("libusb_ddk_host") { ohos_shared_library("libusb_ddk_device") { include_dirs = [ - "$hdf_framework_path/include/config", - "$hdf_framework_path/ability/config/hcs_parser/include", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/include/core", - "$hdf_uhdf_path/include/host", "device/include", "host/include", "//drivers/peripheral/usb/interfaces/ddk/common", @@ -82,8 +70,8 @@ ohos_shared_library("libusb_ddk_device") { ] deps = [ - "$hdf_uhdf_path/config:uhdf_hcs_pkg", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/host:libhdf_host", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] diff --git a/usb/gadget/function/acm/BUILD.gn b/usb/gadget/function/acm/BUILD.gn index 114c23f1bd..6e359bf2eb 100755 --- a/usb/gadget/function/acm/BUILD.gn +++ b/usb/gadget/function/acm/BUILD.gn @@ -28,10 +28,9 @@ ohos_shared_library("libusbfn_cdcacm") { sources = [ "cdcacm.c" ] deps = [ - "//drivers/adapter/uhdf2/config:uhdf_hcs_pkg", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/usb/ddk:libusb_core", "//utils/native/base:utils", ] diff --git a/usb/gadget/function/ecm/BUILD.gn b/usb/gadget/function/ecm/BUILD.gn index a82fbd14fb..327c4324ce 100755 --- a/usb/gadget/function/ecm/BUILD.gn +++ b/usb/gadget/function/ecm/BUILD.gn @@ -28,10 +28,9 @@ ohos_shared_library("libusbfn_cdcecm") { sources = [ "cdcecm.c" ] deps = [ - "//drivers/adapter/uhdf2/config:uhdf_hcs_pkg", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/usb/ddk:libusb_core", "//utils/native/base:utils", ] diff --git a/usb/gadget/function/master/BUILD.gn b/usb/gadget/function/master/BUILD.gn index f328ec54da..ee0c3320d4 100755 --- a/usb/gadget/function/master/BUILD.gn +++ b/usb/gadget/function/master/BUILD.gn @@ -28,10 +28,9 @@ ohos_shared_library("libusbfn_master") { sources = [ "dev_master.c" ] deps = [ - "//drivers/adapter/uhdf2/config:uhdf_hcs_pkg", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/usb/ddk:libusb_core", "//utils/native/base:utils", ] diff --git a/usb/net/BUILD.gn b/usb/net/BUILD.gn index cc05aa96fb..c0bc9f988e 100755 --- a/usb/net/BUILD.gn +++ b/usb/net/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/ohos.gni") import("//drivers/adapter/uhdf2/uhdf.gni") @@ -32,7 +32,7 @@ ohos_shared_library("libusbhost_ecm") { deps = [ "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/usb/ddk:libusb_core", "//utils/native/base:utils", ] diff --git a/usb/sample/device/linux/BUILD.gn b/usb/sample/device/linux/BUILD.gn index 193e1c9fc1..2ee8365036 100755 --- a/usb/sample/device/linux/BUILD.gn +++ b/usb/sample/device/linux/BUILD.gn @@ -17,22 +17,6 @@ import("//drivers/adapter/uhdf2/uhdf.gni") ohos_executable("acm_test") { include_dirs = [ "//utils/native/base/include", - "$hdf_framework_path/core/manager/include", - "$hdf_framework_path/core/host/include", - "$hdf_framework_path/core/shared/include", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/core", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/include/config", - "$hdf_framework_path/ability/config/hcs_parser/include", - "$hdf_uhdf_path/ipc/include", - "$hdf_uhdf_path/osal/include", - "$hdf_uhdf_path/include/config", - "$hdf_uhdf_path/include/host", - "$hdf_uhdf_path/shared/include", - "$hdf_uhdf_path/manager/include", "//drivers/peripheral/usb/interfaces/ddk/device", "//drivers/peripheral/usb/interfaces/ddk/common", "//drivers/peripheral/usb/gadget/function/include", @@ -41,11 +25,10 @@ ohos_executable("acm_test") { sources = [ "acm_test.c" ] deps = [ - "$hdf_uhdf_path/config:uhdf_hcs_pkg", "$hdf_uhdf_path/hdi:libhdi", "$hdf_uhdf_path/host:libhdf_host", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] @@ -62,22 +45,6 @@ ohos_executable("acm_test") { ohos_executable("acm_read") { include_dirs = [ "//utils/native/base/include", - "$hdf_framework_path/core/manager/include", - "$hdf_framework_path/core/host/include", - "$hdf_framework_path/core/shared/include", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/core", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/include/config", - "$hdf_framework_path/ability/config/hcs_parser/include", - "$hdf_uhdf_path/ipc/include", - "$hdf_uhdf_path/osal/include", - "$hdf_uhdf_path/include/config", - "$hdf_uhdf_path/include/host", - "$hdf_uhdf_path/shared/include", - "$hdf_uhdf_path/manager/include", "//drivers/peripheral/usb/interfaces/ddk/device", "//drivers/peripheral/usb/interfaces/ddk/common", "//drivers/peripheral/usb/gadget/function/include", @@ -86,11 +53,10 @@ ohos_executable("acm_read") { sources = [ "acm_read.c" ] deps = [ - "$hdf_uhdf_path/config:uhdf_hcs_pkg", "$hdf_uhdf_path/hdi:libhdi", "$hdf_uhdf_path/host:libhdf_host", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] @@ -107,22 +73,6 @@ ohos_executable("acm_read") { ohos_executable("acm_write") { include_dirs = [ "//utils/native/base/include", - "$hdf_framework_path/core/manager/include", - "$hdf_framework_path/core/host/include", - "$hdf_framework_path/core/shared/include", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/core", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/include/config", - "$hdf_framework_path/ability/config/hcs_parser/include", - "$hdf_uhdf_path/ipc/include", - "$hdf_uhdf_path/osal/include", - "$hdf_uhdf_path/include/config", - "$hdf_uhdf_path/include/host", - "$hdf_uhdf_path/shared/include", - "$hdf_uhdf_path/manager/include", "//drivers/peripheral/usb/interfaces/ddk/device", "//drivers/peripheral/usb/interfaces/ddk/common", "//drivers/peripheral/usb/gadget/function/include", @@ -131,11 +81,10 @@ ohos_executable("acm_write") { sources = [ "acm_write.c" ] deps = [ - "$hdf_uhdf_path/config:uhdf_hcs_pkg", "$hdf_uhdf_path/hdi:libhdi", "$hdf_uhdf_path/host:libhdf_host", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] @@ -152,22 +101,6 @@ ohos_executable("acm_write") { ohos_executable("acm_speed_write") { include_dirs = [ "//utils/native/base/include", - "$hdf_framework_path/core/manager/include", - "$hdf_framework_path/core/host/include", - "$hdf_framework_path/core/shared/include", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/core", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/include/config", - "$hdf_framework_path/ability/config/hcs_parser/include", - "$hdf_uhdf_path/ipc/include", - "$hdf_uhdf_path/osal/include", - "$hdf_uhdf_path/include/config", - "$hdf_uhdf_path/include/host", - "$hdf_uhdf_path/shared/include", - "$hdf_uhdf_path/manager/include", "//drivers/peripheral/usb/interfaces/ddk/device", "//drivers/peripheral/usb/interfaces/ddk/common", "//drivers/peripheral/usb/gadget/function/include", @@ -176,11 +109,10 @@ ohos_executable("acm_speed_write") { sources = [ "acm_speed_write.c" ] deps = [ - "$hdf_uhdf_path/config:uhdf_hcs_pkg", "$hdf_uhdf_path/hdi:libhdi", "$hdf_uhdf_path/host:libhdf_host", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] @@ -197,22 +129,6 @@ ohos_executable("acm_speed_write") { ohos_executable("acm_speed_read") { include_dirs = [ "//utils/native/base/include", - "$hdf_framework_path/core/manager/include", - "$hdf_framework_path/core/host/include", - "$hdf_framework_path/core/shared/include", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/core", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/include/config", - "$hdf_framework_path/ability/config/hcs_parser/include", - "$hdf_uhdf_path/ipc/include", - "$hdf_uhdf_path/osal/include", - "$hdf_uhdf_path/include/config", - "$hdf_uhdf_path/include/host", - "$hdf_uhdf_path/shared/include", - "$hdf_uhdf_path/manager/include", "//drivers/peripheral/usb/interfaces/ddk/device", "//drivers/peripheral/usb/interfaces/ddk/common", "//drivers/peripheral/usb/gadget/function/include", @@ -221,11 +137,10 @@ ohos_executable("acm_speed_read") { sources = [ "acm_speed_read.c" ] deps = [ - "$hdf_uhdf_path/config:uhdf_hcs_pkg", "$hdf_uhdf_path/hdi:libhdi", "$hdf_uhdf_path/host:libhdf_host", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] @@ -242,22 +157,6 @@ ohos_executable("acm_speed_read") { ohos_executable("prop_test") { include_dirs = [ "//utils/native/base/include", - "$hdf_framework_path/core/manager/include", - "$hdf_framework_path/core/host/include", - "$hdf_framework_path/core/shared/include", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/core", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/include/config", - "$hdf_framework_path/ability/config/hcs_parser/include", - "$hdf_uhdf_path/ipc/include", - "$hdf_uhdf_path/osal/include", - "$hdf_uhdf_path/include/config", - "$hdf_uhdf_path/include/host", - "$hdf_uhdf_path/shared/include", - "$hdf_uhdf_path/manager/include", "//drivers/peripheral/usb/interfaces/ddk/device", "//drivers/peripheral/usb/interfaces/ddk/common", "//drivers/peripheral/usb/gadget/function/include", @@ -266,11 +165,10 @@ ohos_executable("prop_test") { sources = [ "prop_test.c" ] deps = [ - "$hdf_uhdf_path/config:uhdf_hcs_pkg", "$hdf_uhdf_path/hdi:libhdi", "$hdf_uhdf_path/host:libhdf_host", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] diff --git a/usb/sample/device/liteos/BUILD.gn b/usb/sample/device/liteos/BUILD.gn index 4ce3f3dabe..8bd0ef61ef 100755 --- a/usb/sample/device/liteos/BUILD.gn +++ b/usb/sample/device/liteos/BUILD.gn @@ -32,7 +32,6 @@ executable("acm_test") { sources = [ "acm_test.c" ] include_dirs = [ - "$HDF_FRAMEWORKS/ability/sbuf/include", "$HDF_FRAMEWORKS/core/shared/include", "$HDF_FRAMEWORKS/core/host/include", "$HDF_FRAMEWORKS/core/master/include", @@ -74,7 +73,6 @@ executable("acm_read") { sources = [ "acm_read.c" ] include_dirs = [ - "$HDF_FRAMEWORKS/ability/sbuf/include", "$HDF_FRAMEWORKS/core/shared/include", "$HDF_FRAMEWORKS/core/host/include", "$HDF_FRAMEWORKS/core/master/include", @@ -109,7 +107,6 @@ executable("acm_write") { sources = [ "acm_write.c" ] include_dirs = [ - "$HDF_FRAMEWORKS/ability/sbuf/include", "$HDF_FRAMEWORKS/core/shared/include", "$HDF_FRAMEWORKS/core/host/include", "$HDF_FRAMEWORKS/core/master/include", @@ -144,7 +141,6 @@ executable("acm_speed_write") { sources = [ "acm_speed_write.c" ] include_dirs = [ - "$HDF_FRAMEWORKS/ability/sbuf/include", "$HDF_FRAMEWORKS/core/shared/include", "$HDF_FRAMEWORKS/core/host/include", "$HDF_FRAMEWORKS/core/master/include", @@ -186,7 +182,6 @@ executable("acm_speed_read") { sources = [ "acm_speed_read.c" ] include_dirs = [ - "$HDF_FRAMEWORKS/ability/sbuf/include", "$HDF_FRAMEWORKS/core/shared/include", "$HDF_FRAMEWORKS/core/host/include", "$HDF_FRAMEWORKS/core/master/include", @@ -228,7 +223,6 @@ executable("prop_test") { sources = [ "prop_test.c" ] include_dirs = [ - "$HDF_FRAMEWORKS/ability/sbuf/include", "$HDF_FRAMEWORKS/core/shared/include", "$HDF_FRAMEWORKS/core/host/include", "$HDF_FRAMEWORKS/core/master/include", diff --git a/usb/sample/host/BUILD.gn b/usb/sample/host/BUILD.gn index 1a776c1542..3bb80d16a7 100755 --- a/usb/sample/host/BUILD.gn +++ b/usb/sample/host/BUILD.gn @@ -30,7 +30,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/core/adapter/syscall/include", "//drivers/framework/include/core", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/core/shared/include", "//drivers/framework/core/common/include/host", "//drivers/framework/utils/include", @@ -61,22 +60,6 @@ if (defined(ohos_lite)) { ohos_executable("usbhost_ddk_test") { include_dirs = [ "//utils/native/base/include", - "$hdf_framework_path/core/manager/include", - "$hdf_framework_path/core/host/include", - "$hdf_framework_path/core/shared/include", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/core", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/include/config", - "$hdf_framework_path/ability/config/hcs_parser/include", - "$hdf_uhdf_path/ipc/include", - "$hdf_uhdf_path/osal/include", - "$hdf_uhdf_path/include/config", - "$hdf_uhdf_path/include/host", - "$hdf_uhdf_path/shared/include", - "$hdf_uhdf_path/manager/include", "include", "//drivers/peripheral/usb/ddk/common/include", "//drivers/peripheral/usb/ddk/device/include", @@ -93,11 +76,10 @@ if (defined(ohos_lite)) { ] deps = [ - "$hdf_uhdf_path/config:uhdf_hcs_pkg", "$hdf_uhdf_path/hdi:libhdi", "$hdf_uhdf_path/host:libhdf_host", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] @@ -130,7 +112,7 @@ if (defined(ohos_lite)) { deps = [ "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/usb/ddk:libusb_core", "//utils/native/base:utils", ] @@ -147,22 +129,6 @@ if (defined(ohos_lite)) { ohos_executable("usbhost_pnp_test") { include_dirs = [ "//utils/native/base/include", - "$hdf_framework_path/core/manager/include", - "$hdf_framework_path/core/host/include", - "$hdf_framework_path/core/shared/include", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/core", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/include/config", - "$hdf_framework_path/ability/config/hcs_parser/include", - "$hdf_uhdf_path/ipc/include", - "$hdf_uhdf_path/osal/include", - "$hdf_uhdf_path/include/config", - "$hdf_uhdf_path/include/host", - "$hdf_uhdf_path/shared/include", - "$hdf_uhdf_path/manager/include", "include", "//drivers/peripheral/usb/serial/include", ] @@ -170,11 +136,10 @@ if (defined(ohos_lite)) { sources = [ "src/usbhost_pnp_test.c" ] deps = [ - "$hdf_uhdf_path/config:uhdf_hcs_pkg", "$hdf_uhdf_path/hdi:libhdi", "$hdf_uhdf_path/host:libhdf_host", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] @@ -204,7 +169,7 @@ if (defined(ohos_lite)) { deps = [ "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/usb/ddk:libusb_core", "//utils/native/base:utils", ] @@ -235,7 +200,7 @@ if (defined(ohos_lite)) { deps = [ "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/usb/ddk:libusb_core", "//utils/native/base:utils", ] @@ -253,22 +218,6 @@ if (defined(ohos_lite)) { ohos_executable("usbhost_nosdk_speed_test") { include_dirs = [ "//utils/native/base/include", - "$hdf_framework_path/core/manager/include", - "$hdf_framework_path/core/host/include", - "$hdf_framework_path/core/shared/include", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/core", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/include/config", - "$hdf_framework_path/ability/config/hcs_parser/include", - "$hdf_uhdf_path/ipc/include", - "$hdf_uhdf_path/osal/include", - "$hdf_uhdf_path/include/config", - "$hdf_uhdf_path/include/host", - "$hdf_uhdf_path/shared/include", - "$hdf_uhdf_path/manager/include", "include", "//drivers/peripheral/usb/ddk/common/include", "//drivers/peripheral/usb/ddk/device/include", @@ -282,11 +231,10 @@ if (defined(ohos_lite)) { sources = [ "src/usbhost_nosdk_speed.c" ] deps = [ - "$hdf_uhdf_path/config:uhdf_hcs_pkg", "$hdf_uhdf_path/hdi:libhdi", "$hdf_uhdf_path/host:libhdf_host", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] @@ -315,7 +263,7 @@ if (defined(ohos_lite)) { deps = [ "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/usb/ddk:libusb_core", "//utils/native/base:utils", ] diff --git a/usb/sample/host/liteos_test/BUILD.gn b/usb/sample/host/liteos_test/BUILD.gn old mode 100755 new mode 100644 index 95b347004b..4b55a7086d --- a/usb/sample/host/liteos_test/BUILD.gn +++ b/usb/sample/host/liteos_test/BUILD.gn @@ -20,7 +20,6 @@ executable("liteos_host_speed_test") { output_dir = "$USB_OUTPUT_DIR" sources = [ "src/usbhost_speed_test.c" ] include_dirs = [ - "$HDF_FWKS/ability/sbuf/include", "$HDF_FWKS/core/shared/include", "$HDF_FWKS/core/host/include", "$HDF_FWKS/core/master/include", diff --git a/usb/serial/BUILD.gn b/usb/serial/BUILD.gn index 6b24774e02..77e9c3e2a5 100755 --- a/usb/serial/BUILD.gn +++ b/usb/serial/BUILD.gn @@ -32,7 +32,7 @@ ohos_shared_library("libusbhost_acm") { deps = [ "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/usb/ddk:libusb_core", "//utils/native/base:utils", ] @@ -61,7 +61,7 @@ ohos_shared_library("libusbhost_acm_rawapi") { deps = [ "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/usb/ddk:libusb_core", "//utils/native/base:utils", ] diff --git a/usb/test/moduletest/BUILD.gn b/usb/test/moduletest/BUILD.gn index 724ce65448..4eecb3b2f6 100755 --- a/usb/test/moduletest/BUILD.gn +++ b/usb/test/moduletest/BUILD.gn @@ -34,7 +34,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/core/adapter/syscall/include", "//drivers/framework/include/core", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/core/shared/include", "//drivers/framework/core/common/include/host", "//drivers/framework/utils/include", @@ -76,7 +75,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/core/adapter/syscall/include", "//drivers/framework/include/core", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/core/shared/include", "//drivers/framework/core/common/include/host", "//drivers/framework/utils/include", @@ -118,7 +116,6 @@ if (defined(ohos_lite)) { "//drivers/framework/include/osal", "//drivers/framework/core/adapter/syscall/include", "//drivers/framework/include/core", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/core/shared/include", "//drivers/framework/core/common/include/host", "//drivers/framework/utils/include", @@ -153,7 +150,6 @@ if (defined(ohos_lite)) { include_dirs = [ "//third_party/googletest/googletest/include", "//drivers/peripheral/usb/sample/device/liteos/lib/include", - "$hdf_framework_path/ability/sbuf/include", "$hdf_framework_path/core/shared/include", "$hdf_framework_path/core/host/include", "$hdf_framework_path/core/master/include", @@ -184,7 +180,6 @@ if (defined(ohos_lite)) { include_dirs = [ "//third_party/googletest/googletest/include", "//drivers/peripheral/usb/sample/device/liteos/lib/include", - "$hdf_framework_path/ability/sbuf/include", "$hdf_framework_path/core/shared/include", "$hdf_framework_path/core/host/include", "$hdf_framework_path/core/master/include", @@ -224,10 +219,6 @@ if (defined(ohos_lite)) { module_out_path = module_output_path include_dirs = [ "//third_party/googletest/googletest/include", - "$hdf_framework_path/include/config", - "$hdf_framework_path/ability/config/hcs_parser/include", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/utils/include", "common", ] sources = [ @@ -235,8 +226,7 @@ if (defined(ohos_lite)) { "./common/usb_utils.cpp", ] deps = [ - "$hdf_uhdf_path/config:uhdf_hcs_pkg", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] } @@ -286,10 +276,6 @@ if (defined(ohos_lite)) { module_out_path = module_output_path include_dirs = [ "//third_party/googletest/googletest/include", - "$hdf_framework_path/include/config", - "$hdf_framework_path/ability/config/hcs_parser/include", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/utils/include", "common", ] sources = [ @@ -297,8 +283,7 @@ if (defined(ohos_lite)) { "./common/usb_utils.cpp", ] deps = [ - "$hdf_uhdf_path/config:uhdf_hcs_pkg", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] } @@ -307,10 +292,6 @@ if (defined(ohos_lite)) { module_out_path = module_output_path include_dirs = [ "//third_party/googletest/googletest/include", - "$hdf_framework_path/include/config", - "$hdf_framework_path/ability/config/hcs_parser/include", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/utils/include", "common", ] sources = [ @@ -318,8 +299,7 @@ if (defined(ohos_lite)) { "./common/usb_utils.cpp", ] deps = [ - "$hdf_uhdf_path/config:uhdf_hcs_pkg", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] } diff --git a/usb/test/performance/BUILD.gn b/usb/test/performance/BUILD.gn index 4d6e37d5ef..2d59ef2fc3 100755 --- a/usb/test/performance/BUILD.gn +++ b/usb/test/performance/BUILD.gn @@ -26,13 +26,11 @@ if (defined(ohos_lite)) { include_dirs = [ "//third_party/googletest/googletest/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/include/osal", "//drivers/adapter/uhdf/posix/include", "//drivers/framework/include/utils", - "//drivers/framework/include/config", "//drivers/framework/include", "//drivers/framework/test/unittest/include", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", diff --git a/wlan/client/BUILD.gn b/wlan/client/BUILD.gn index 0b7205d4e8..b200a48828 100755 --- a/wlan/client/BUILD.gn +++ b/wlan/client/BUILD.gn @@ -35,7 +35,6 @@ if (defined(ohos_lite)) { "$FWK_ROOT_DIR/include", "$FWK_ROOT_DIR/include/utils", "$FWK_ROOT_DIR/core/shared/include", - "$FWK_ROOT_DIR/ability/sbuf/include", "$FWK_ROOT_DIR/include/core", "//drivers/adapter/uhdf/posix/include", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", @@ -83,7 +82,7 @@ if (defined(ohos_lite)) { deps = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//utils/native/base:utils", ] diff --git a/wlan/hal/BUILD.gn b/wlan/hal/BUILD.gn index 10e3fb8376..7bad207f58 100755 --- a/wlan/hal/BUILD.gn +++ b/wlan/hal/BUILD.gn @@ -39,7 +39,6 @@ if (defined(ohos_lite)) { "$FWK_ROOT_DIR/include", "$FWK_ROOT_DIR/include/wifi", "$FWK_ROOT_DIR/include/utils", - "$FWK_ROOT_DIR/ability/sbuf/include", "//drivers/adapter/uhdf/posix/include", "//third_party/bounds_checking_function/include", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", @@ -87,7 +86,7 @@ if (defined(ohos_lite)) { "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/wlan/client:wifi_driver_client", "//utils/native/base:utils", ] diff --git a/wlan/hdi_service/BUILD.gn b/wlan/hdi_service/BUILD.gn index 54347d405d..fce21fce02 100644 --- a/wlan/hdi_service/BUILD.gn +++ b/wlan/hdi_service/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/ohos.gni") import("//drivers/adapter/uhdf2/uhdf.gni") @@ -45,7 +45,7 @@ ohos_shared_library("wifi_hdi_device") { "$hdf_uhdf_path/hdi:libhdi", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/wlan/client:wifi_driver_client", "//drivers/peripheral/wlan/hal:wifi_hal", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", @@ -100,7 +100,7 @@ ohos_shared_library("wifi_hdi_c_device") { "$hdf_uhdf_path/hdi:libhdi", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/peripheral/wlan/client:wifi_driver_client", "//drivers/peripheral/wlan/hal:wifi_hal", "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", diff --git a/wlan/test/hdi_service/BUILD.gn b/wlan/test/hdi_service/BUILD.gn index 768578cb4c..db7bb3c193 100644 --- a/wlan/test/hdi_service/BUILD.gn +++ b/wlan/test/hdi_service/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/test.gni") import("//drivers/adapter/uhdf2/uhdf.gni") @@ -17,7 +17,7 @@ import("//drivers/adapter/uhdf2/uhdf.gni") module_output_path = "hdf/hdi" FWK_ROOT_DIR = "//drivers/framework" -###########################palTest########################### +###########################palTest########################### ohos_unittest("WlanHdiServiceTest") { module_out_path = module_output_path @@ -26,7 +26,7 @@ ohos_unittest("WlanHdiServiceTest") { deps = [ "$hdf_uhdf_path/hdi:libhdi", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", "//drivers/peripheral/wlan/client:wifi_driver_client", "//drivers/peripheral/wlan/hal:wifi_hal", @@ -45,7 +45,6 @@ ohos_unittest("WlanHdiServiceTest") { "//drivers/peripheral/wlan/hal/include", "//drivers/peripheral/wlan/hdi_service/include", "$FWK_ROOT_DIR/core/shared/include", - "$FWK_ROOT_DIR/ability/sbuf/include", "$FWK_ROOT_DIR/include", "$FWK_ROOT_DIR/include/wifi", "$FWK_ROOT_DIR/include/core", @@ -69,7 +68,7 @@ ohos_unittest("WlanHdiServiceTestC") { deps = [ "$hdf_uhdf_path/hdi:libhdi", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", "//drivers/peripheral/wlan/client:wifi_driver_client", "//drivers/peripheral/wlan/hal:wifi_hal", @@ -88,7 +87,6 @@ ohos_unittest("WlanHdiServiceTestC") { "//drivers/peripheral/wlan/hal/include", "//drivers/peripheral/wlan/hdi_service/include", "$FWK_ROOT_DIR/core/shared/include", - "$FWK_ROOT_DIR/ability/sbuf/include", "$FWK_ROOT_DIR/include", "$FWK_ROOT_DIR/include/wifi", "$FWK_ROOT_DIR/include/core", diff --git a/wlan/test/performance/BUILD.gn b/wlan/test/performance/BUILD.gn index 3fc95ff233..8082850e86 100644 --- a/wlan/test/performance/BUILD.gn +++ b/wlan/test/performance/BUILD.gn @@ -25,13 +25,11 @@ if (defined(ohos_lite)) { include_dirs = [ "//third_party/googletest/googletest/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/include/osal", "//drivers/adapter/uhdf/posix/include", "//drivers/framework/include/utils", - "//drivers/framework/include/config", "//drivers/framework/include", "//drivers/peripheral/wlan/client/include", "//drivers/peripheral/wlan/hal/include", @@ -78,8 +76,8 @@ if (defined(ohos_lite)) { "-fno-strict-aliasing", ] deps = [ - "$hdf_uhdf_path/osal:libhdf_utils", "$hdf_uhdf_path/test/unittest/common:libhdf_test_common", + "$hdf_uhdf_path/utils:libhdf_utils", "//drivers/peripheral/wlan/client:wifi_driver_client", "//drivers/peripheral/wlan/hal:wifi_hal", "//utils/native/base:utils", diff --git a/wlan/test/unittest/BUILD.gn b/wlan/test/unittest/BUILD.gn index 6150d220ec..0e880b8f40 100644 --- a/wlan/test/unittest/BUILD.gn +++ b/wlan/test/unittest/BUILD.gn @@ -25,13 +25,11 @@ if (defined(ohos_lite)) { include_dirs = [ "//third_party/googletest/googletest/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/include/osal", "//drivers/adapter/uhdf/posix/include", "//drivers/framework/include/utils", - "//drivers/framework/include/config", "//drivers/framework/include", "//drivers/peripheral/wlan/client/include", "//drivers/peripheral/wlan/hal/include", @@ -96,8 +94,8 @@ if (defined(ohos_lite)) { "-fno-strict-aliasing", ] deps = [ - "$hdf_uhdf_path/osal:libhdf_utils", "$hdf_uhdf_path/test/unittest/common:libhdf_test_common", + "$hdf_uhdf_path/utils:libhdf_utils", "//drivers/peripheral/wlan/client:wifi_driver_client", "//drivers/peripheral/wlan/hal:wifi_hal", "//utils/native/base:utils", -- Gitee