diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index 7f72317acd3cf9ccb6aea3bca84d6ed4c626b308..e6fcefc222e8ec39e8ec0c49a24c6dd15221479b 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -12,22 +12,19 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("audio.gni")
 
 group("hdi_audio") {
   deps = []
-  if (drivers_peripheral_audio_user_mode == false) {
-    if (drivers_peripheral_audio_rich_device == false) {
+  if (drivers_peripheral_audio_feature_user_mode == false) {
+    if (drivers_peripheral_audio_feature_rich_device == false) {
       deps += [ "hal/hdi_passthrough:hdi_audio" ]
     }
-  } else {
-    deps += [ "//device/soc/${product_company}/common/hal/media:hdi_audio" ]
   }
 
   if (defined(ohos_lite)) {
   } else {
-    if (drivers_peripheral_audio_hdf_proxy_stub == true) {
+    if (drivers_peripheral_audio_feature_hdf_proxy_stub == true) {
       deps += [
         "hal/hdi_binder/proxy:hdi_audio_client",
         "hal/hdi_binder/server:hdi_audio_a2dp_server",
@@ -44,18 +41,18 @@ group("hdi_audio") {
     ]
   }
 
-  if (drivers_peripheral_audio_user_mode == false) {
+  if (drivers_peripheral_audio_feature_user_mode == false) {
     deps += [
       "supportlibs:hdi_audio_interface_lib_capture",
       "supportlibs:hdi_audio_interface_lib_render",
     ]
   }
 
-  if (drivers_peripheral_audio_hal_notsupport_pathselect == false) {
+  if (drivers_peripheral_audio_feature_hal_notsupport_pathselect == false) {
     deps += [ "hal/pathselect:hdi_audio_path_select" ]
   }
 
-  if (drivers_peripheral_audio_policy_config == true) {
+  if (drivers_peripheral_audio_feature_policy_config == true) {
     deps += [
       "//vendor/${product_company}/${product_name}/audio:audio_policy_config",
     ]
diff --git a/audio/audio.gni b/audio/audio.gni
index 6500ef4f0c8e4c78d52b61b96f80ef77ea0dad8a..2dc7b127bc6a2f0b6100431624a47a50a03612a8 100644
--- a/audio/audio.gni
+++ b/audio/audio.gni
@@ -4,43 +4,36 @@ if (defined(ohos_lite)) {
   import("${ohos_product_adapter_dir}/audio/product.gni")
 } else {
   import("//build/ohos.gni")
-  if (product_name == "ohos-arm64") {
-    enable_audio_hal_notsupport_pathselect = false
-  }
 }
 
 declare_args() {
   drivers_peripheral_audio_feature_mono_to_stereo = false
-  drivers_peripheral_audio_hal_notsupport_pathselect = false
-  drivers_peripheral_audio_hdf_proxy_stub = true
-  drivers_peripheral_audio_user_mode = false
-  drivers_peripheral_audio_full_test_suite = false
-  drivers_peripheral_audio_policy_config = true
-  drivers_peripheral_audio_alsa_lib = false
-  drivers_peripheral_audio_rich_device = false
-  drivers_peripheral_audio_community = true
+  drivers_peripheral_audio_feature_hal_notsupport_pathselect = false
+  drivers_peripheral_audio_feature_hdf_proxy_stub = true
+  drivers_peripheral_audio_feature_user_mode = false
+  drivers_peripheral_audio_feature_full_test_suite = false
+  drivers_peripheral_audio_feature_policy_config = true
+  drivers_peripheral_audio_feature_alsa_lib = false
+  drivers_peripheral_audio_feature_rich_device = false
+  drivers_peripheral_audio_feature_community = true
   drivers_peripheral_audio_feature_effect = false
 }
 
-if (product_name == "ohos-arm64") {
-  drivers_peripheral_audio_hal_notsupport_pathselect = false
-}
-
 if (defined(ohos_lite)) {
   if (defined(enable_audio_hal_notsupport_pathselect) &&
       enable_audio_hal_notsupport_pathselect == true) {
-    drivers_peripheral_audio_hal_notsupport_pathselect = true
+    drivers_peripheral_audio_feature_hal_notsupport_pathselect = true
   } else {
-    drivers_peripheral_audio_hal_notsupport_pathselect = false
+    drivers_peripheral_audio_feature_hal_notsupport_pathselect = false
   }
   if (defined(enable_audio_policy_config) &&
       enable_audio_policy_config == true) {
-    drivers_peripheral_audio_policy_config = true
+    drivers_peripheral_audio_feature_policy_config = true
   } else {
-    drivers_peripheral_audio_policy_config = false
+    drivers_peripheral_audio_feature_policy_config = false
   }
   if (defined(enable_hdf_audio_full_test_suite)) {
-    drivers_peripheral_audio_full_test_suite = true
+    drivers_peripheral_audio_feature_full_test_suite = true
   }
 }
 
diff --git a/audio/bundle.json b/audio/bundle.json
index 2a806790ef220fac756d974874a4594a7742b8c6..3aa00acaf93714d8f9df1ca85d613658eeb028f1 100755
--- a/audio/bundle.json
+++ b/audio/bundle.json
@@ -14,14 +14,14 @@
     "subsystem": "hdf",
     "features": [
       "drivers_peripheral_audio_feature_mono_to_stereo",
-      "drivers_peripheral_audio_hal_notsupport_pathselect",
-      "drivers_peripheral_audio_hdf_proxy_stub",
-      "drivers_peripheral_audio_user_mode",
-      "drivers_peripheral_audio_full_test_suite",
-      "drivers_peripheral_audio_policy_config",
-      "drivers_peripheral_audio_alsa_lib",
-      "drivers_peripheral_audio_rich_device",
-      "drivers_peripheral_audio_community",
+      "drivers_peripheral_audio_feature_hal_notsupport_pathselect",
+      "drivers_peripheral_audio_feature_hdf_proxy_stub",
+      "drivers_peripheral_audio_feature_user_mode",
+      "drivers_peripheral_audio_feature_full_test_suite",
+      "drivers_peripheral_audio_feature_policy_config",
+      "drivers_peripheral_audio_feature_alsa_lib",
+      "drivers_peripheral_audio_feature_rich_device",
+      "drivers_peripheral_audio_feature_community",
       "drivers_peripheral_audio_feature_effect"
     ],
     "syscap": [ "" ],
diff --git a/audio/effect/model/BUILD.gn b/audio/effect/model/BUILD.gn
index a4f2c22f8603c2ddf5698be3eb2dc65222fc8ebf..2aab81bd582f4dbdcde7240561acd18d2f3978d0 100644
--- a/audio/effect/model/BUILD.gn
+++ b/audio/effect/model/BUILD.gn
@@ -12,7 +12,6 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 
 if (!defined(ohos_lite)) {
   ohos_shared_library("effect_model_service_1.0") {
diff --git a/audio/effect/model/src/mock_effect/BUILD.gn b/audio/effect/model/src/mock_effect/BUILD.gn
index 358f60da551c7a8437017a367521e85f6d4ef810..1d8bac809146bd840149ee88f53c1031bd59d580 100644
--- a/audio/effect/model/src/mock_effect/BUILD.gn
+++ b/audio/effect/model/src/mock_effect/BUILD.gn
@@ -12,7 +12,6 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 
 if (!defined(ohos_lite)) {
   ohos_shared_library("mock_effect_lib") {
diff --git a/audio/effect/test/BUILD.gn b/audio/effect/test/BUILD.gn
index 9bcc275bdcf6df2c1d02434c2e72aa6254b44e38..c45acfd3a62d62ee4180077d77d4ec52711b0207 100644
--- a/audio/effect/test/BUILD.gn
+++ b/audio/effect/test/BUILD.gn
@@ -12,7 +12,6 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 group("effect_test") {
diff --git a/audio/effect/test/unittest/BUILD.gn b/audio/effect/test/unittest/BUILD.gn
index e3d7937d68cc8a989f9fd900db4100c280837ff8..dc743e337540e19aec1de4a39d32f19aa68ea4a4 100644
--- a/audio/effect/test/unittest/BUILD.gn
+++ b/audio/effect/test/unittest/BUILD.gn
@@ -12,7 +12,6 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 
 ohos_unittest("hdf_effect_hdi_ut") {
   module_out_path = "drivers_peripheral_audio/audio"
diff --git a/audio/hal/hdi_binder/proxy/BUILD.gn b/audio/hal/hdi_binder/proxy/BUILD.gn
index 64bcb94bca1544745e0c3195afd3b12d3e6aeadc..971b1308407f893ccbb42138b61aa69e8690f3f1 100644
--- a/audio/hal/hdi_binder/proxy/BUILD.gn
+++ b/audio/hal/hdi_binder/proxy/BUILD.gn
@@ -12,10 +12,9 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
-if (drivers_peripheral_audio_hdf_proxy_stub == true) {
+if (drivers_peripheral_audio_feature_hdf_proxy_stub == true) {
   if (defined(ohos_lite)) {
     ohos_shared_library("hdi_audio_client") {
       include_dirs = [
diff --git a/audio/hal/hdi_binder/server/BUILD.gn b/audio/hal/hdi_binder/server/BUILD.gn
index 55c81507512c76b89ede2674ae6d202e00cc89ea..1c0ca08607330cbcd941acadaf1d439ceccaf2c5 100644
--- a/audio/hal/hdi_binder/server/BUILD.gn
+++ b/audio/hal/hdi_binder/server/BUILD.gn
@@ -12,10 +12,9 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
-if (drivers_peripheral_audio_hdf_proxy_stub == true) {
+if (drivers_peripheral_audio_feature_hdf_proxy_stub == true) {
   ohos_shared_library("hdi_audio_primary_server") {
     include_dirs = [
       "//drivers/peripheral/audio/interfaces/include",
@@ -33,22 +32,6 @@ if (drivers_peripheral_audio_hdf_proxy_stub == true) {
     ]
 
     deps = [ "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio_common" ]
-    if (!drivers_peripheral_audio_user_mode) {
-      if (drivers_peripheral_audio_rich_device == false) {
-        deps += [ "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio" ]
-      } else {
-        AUDIO_VENDOR_LIB_PATH = rebase_path(
-                "//vendor/$device_company/ap/prebuilt_scripts/ohos_vendor/vendorlibs/audio_hdi")
-        cmd = "if [ -f ${AUDIO_VENDOR_LIB_PATH}/BUILD.gn ]; then echo true; else echo false; fi"
-        HAVE_AUDIO_VENDOR_LIB =
-            exec_script("//build/lite/run_shell_cmd.py", [ cmd ], "value")
-        if (HAVE_AUDIO_VENDOR_LIB) {
-          deps += [ "${AUDIO_VENDOR_LIB_PATH}:hdi_audio" ]
-        }
-      }
-    } else {
-      deps += [ "//device/soc/${product_company}/common/hal/media:hdi_audio" ]
-    }
 
     defines = []
     if (is_standard_system) {
@@ -89,22 +72,6 @@ if (drivers_peripheral_audio_hdf_proxy_stub == true) {
     ]
 
     deps = [ "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio_common" ]
-    if (!drivers_peripheral_audio_user_mode) {
-      if (drivers_peripheral_audio_rich_device == false) {
-        deps += [ "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio" ]
-      } else {
-        AUDIO_VENDOR_LIB_PATH = rebase_path(
-                "//vendor/$device_company/ap/prebuilt_scripts/ohos_vendor/vendorlibs/audio_hdi")
-        cmd = "if [ -f ${AUDIO_VENDOR_LIB_PATH}/BUILD.gn ]; then echo true; else echo false; fi"
-        HAVE_AUDIO_VENDOR_LIB =
-            exec_script("//build/lite/run_shell_cmd.py", [ cmd ], "value")
-        if (HAVE_AUDIO_VENDOR_LIB) {
-          deps += [ "${AUDIO_VENDOR_LIB_PATH}:hdi_audio" ]
-        }
-      }
-    } else {
-      deps += [ "//device/soc/${product_company}/common/hal/media:hdi_audio" ]
-    }
     if (is_standard_system) {
       external_deps = [
         "c_utils:utils",
@@ -143,22 +110,6 @@ if (drivers_peripheral_audio_hdf_proxy_stub == true) {
     ]
 
     deps = [ "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio_common" ]
-    if (!drivers_peripheral_audio_user_mode) {
-      if (drivers_peripheral_audio_rich_device == false) {
-        deps += [ "//drivers/peripheral/audio/hal/hdi_passthrough:hdi_audio" ]
-      } else {
-        AUDIO_VENDOR_LIB_PATH = rebase_path(
-                "//vendor/$device_company/ap/prebuilt_scripts/ohos_vendor/vendorlibs/audio_hdi")
-        cmd = "if [ -f ${AUDIO_VENDOR_LIB_PATH}/BUILD.gn ]; then echo true; else echo false; fi"
-        HAVE_AUDIO_VENDOR_LIB =
-            exec_script("//build/lite/run_shell_cmd.py", [ cmd ], "value")
-        if (HAVE_AUDIO_VENDOR_LIB) {
-          deps += [ "${AUDIO_VENDOR_LIB_PATH}:hdi_audio" ]
-        }
-      }
-    } else {
-      deps += [ "//device/soc/${product_company}/common/hal/media:hdi_audio" ]
-    }
     if (is_standard_system) {
       external_deps = [
         "c_utils:utils",
diff --git a/audio/hal/hdi_binder/server/include/hdf_audio_server_common.h b/audio/hal/hdi_binder/server/include/hdf_audio_server_common.h
index 293945e6f1e1b5329443101b93e9d1cf3b131864..28b3768e54938e7e36fb59d9b1c262e2432121ef 100644
--- a/audio/hal/hdi_binder/server/include/hdf_audio_server_common.h
+++ b/audio/hal/hdi_binder/server/include/hdf_audio_server_common.h
@@ -101,6 +101,7 @@ int32_t HdiServicePositionWrite(struct HdfSBuf *reply,
 int32_t HdiServiceReqMmapBuffer(struct AudioMmapBufferDescriptor *desc, struct HdfSBuf *data);
 
 int32_t HdiServiceGetFuncs();
+void AudioHdiServerRelease();
 int32_t HdiServiceGetAllAdapter(const struct HdfDeviceIoClient *client,
     struct HdfSBuf *data, struct HdfSBuf *reply);
 int32_t HdiServiceLoadAdapter(const struct HdfDeviceIoClient *client,
diff --git a/audio/hal/hdi_binder/server/src/hdf_audio_primary_server.c b/audio/hal/hdi_binder/server/src/hdf_audio_primary_server.c
index d56331aa706b6c46b50544dfe71f130350453356..6c8e09059f8e4871b725992739e7544442adf354 100644
--- a/audio/hal/hdi_binder/server/src/hdf_audio_primary_server.c
+++ b/audio/hal/hdi_binder/server/src/hdf_audio_primary_server.c
@@ -28,7 +28,7 @@ static void AudioHdiPrimaryServerRelease(struct HdfDeviceObject *deviceObject)
     AUDIO_FUNC_LOGI("enter!");
     /* g_renderAndCaptureManage release */
     AdaptersServerManageInfomationRecycle();
-    ReleaseAudioManagerObjectComm(GetAudioManagerFuncs());
+    AudioHdiServerRelease();
 
     if (deviceObject == NULL) {
         AUDIO_FUNC_LOGE("Parameter is null!");
diff --git a/audio/hal/hdi_binder/server/src/hdf_audio_server_common.c b/audio/hal/hdi_binder/server/src/hdf_audio_server_common.c
index 363b4eb9f572c64f60f4119583584dddf1144b62..d6476116c89ea9630e6287f48dcd648b2a5adcdf 100644
--- a/audio/hal/hdi_binder/server/src/hdf_audio_server_common.c
+++ b/audio/hal/hdi_binder/server/src/hdf_audio_server_common.c
@@ -1166,15 +1166,42 @@ int32_t HdiServiceGetFuncs()
     if (g_serverManager != NULL) {
         return AUDIO_HAL_SUCCESS;
     }
-    g_serverManager = GetAudioManagerFuncs();
+
+    char *error = NULL;
+    struct AudioManager *(*managerFuncs)(void);
+    const char *hdiAudioVendorLibPath = HDF_LIBRARY_FULL_PATH("libhdi_audio");
+    void *handle = dlopen(hdiAudioVendorLibPath, RTLD_LAZY);
+    if (handle == NULL) {
+        error = dlerror();
+        AUDIO_FUNC_LOGE("audio load path %{public}s, dlopen err=%{public}s", hdiAudioVendorLibPath, error);
+        return AUDIO_HAL_ERR_INTERNAL;
+    }
+    managerFuncs = dlsym(handle, "GetAudioManagerFuncs");
+    g_serverManager = managerFuncs();
     if (g_serverManager == NULL) {
-        AUDIO_FUNC_LOGE("GetAudioManagerFuncs FAIL!");
+        error = dlerror();
+        AUDIO_FUNC_LOGE("dlsym GetAudioManagerFuncs err=%{public}s", error);
+        dlclose(handle);
+        handle = NULL;
         return AUDIO_HAL_ERR_INTERNAL;
     }
     AUDIO_FUNC_LOGD("end");
     return AUDIO_HAL_SUCCESS;
 }
 
+void AudioHdiServerRelease()
+{
+    AUDIO_FUNC_LOGI("enter to %{public}s!", __func__);
+
+    if (g_serverManager == NULL) {
+        AUDIO_FUNC_LOGE("manager func is null!");
+        return;
+    }
+    ReleaseAudioManagerObjectComm(g_serverManager);
+    AUDIO_FUNC_LOGD("%{public}s success", __func__);
+    return;
+}
+
 int32_t HdiServiceGetAllAdapter(const struct HdfDeviceIoClient *client,
     struct HdfSBuf *data, struct HdfSBuf *reply)
 {
diff --git a/audio/hal/hdi_binder/server/src/hdf_audio_usb_server.c b/audio/hal/hdi_binder/server/src/hdf_audio_usb_server.c
index 74914c89c4c86555f1216c4e365a38786c1ef430..91d62d69999b8c4e8c8a0c9b74ad8df77334b4f7 100644
--- a/audio/hal/hdi_binder/server/src/hdf_audio_usb_server.c
+++ b/audio/hal/hdi_binder/server/src/hdf_audio_usb_server.c
@@ -26,7 +26,7 @@ static void AudioHdiUsbServerRelease(struct HdfDeviceObject *deviceObject)
     AUDIO_FUNC_LOGI("enter!");
     /* g_renderAndCaptureManage release */
     AdaptersServerManageInfomationRecycle();
-    ReleaseAudioManagerObjectComm(GetAudioManagerFuncs());
+    AudioHdiServerRelease();
 
     if (deviceObject == NULL) {
         AUDIO_FUNC_LOGE("deviceObject is null!");
diff --git a/audio/hal/hdi_passthrough/BUILD.gn b/audio/hal/hdi_passthrough/BUILD.gn
index 623a788ff3a3765ef27e410e4ea3b3b27b5859e9..bacb93345d5f00f106a38ff2dc26b5a992be1d45 100644
--- a/audio/hal/hdi_passthrough/BUILD.gn
+++ b/audio/hal/hdi_passthrough/BUILD.gn
@@ -12,7 +12,6 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 if (defined(ohos_lite)) {
@@ -39,7 +38,7 @@ if (defined(ohos_lite)) {
     ]
     external_deps = [ "hdf_core:libhdf_utils" ]
     defines = []
-    if (drivers_peripheral_audio_hal_notsupport_pathselect) {
+    if (drivers_peripheral_audio_feature_hal_notsupport_pathselect) {
       defines += [ "AUDIO_HAL_NOTSUPPORT_PATHSELECT" ]
     }
 
@@ -58,7 +57,7 @@ if (defined(ohos_lite)) {
     part_name = "drivers_peripheral_audio"
   }
 } else {
-  if (!drivers_peripheral_audio_user_mode) {
+  if (!drivers_peripheral_audio_feature_user_mode) {
     ohos_shared_library("hdi_audio") {
       sources = [
         "src/audio_adapter.c",
@@ -78,7 +77,7 @@ if (defined(ohos_lite)) {
 
       defines = []
 
-      if (drivers_peripheral_audio_hal_notsupport_pathselect) {
+      if (drivers_peripheral_audio_feature_hal_notsupport_pathselect) {
         defines += [ "AUDIO_HAL_NOTSUPPORT_PATHSELECT" ]
       }
       if (enable_audio_hal_hdf_log) {
@@ -125,7 +124,7 @@ if (defined(ohos_lite)) {
     ]
     external_deps = [ "hdf_core:libhdf_utils" ]
     defines = []
-    if (drivers_peripheral_audio_hal_notsupport_pathselect) {
+    if (drivers_peripheral_audio_feature_hal_notsupport_pathselect) {
       defines += [ "AUDIO_HAL_NOTSUPPORT_PATHSELECT" ]
     }
 
@@ -159,7 +158,7 @@ if (defined(ohos_lite)) {
 
     defines = []
 
-    if (drivers_peripheral_audio_hal_notsupport_pathselect) {
+    if (drivers_peripheral_audio_feature_hal_notsupport_pathselect) {
       defines += [ "AUDIO_HAL_NOTSUPPORT_PATHSELECT" ]
     }
 
diff --git a/audio/hal/pathselect/BUILD.gn b/audio/hal/pathselect/BUILD.gn
index 01049ca0cb76eb04a10613061a9cbb93595eb5fb..01889860c8763ad6f65840b051bc369607cc5757 100644
--- a/audio/hal/pathselect/BUILD.gn
+++ b/audio/hal/pathselect/BUILD.gn
@@ -12,7 +12,6 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 if (defined(ohos_lite)) {
@@ -61,7 +60,7 @@ if (defined(ohos_lite)) {
       defines += [ "AUDIO_HDF_LOG" ]
     }
 
-    if (drivers_peripheral_audio_alsa_lib) {
+    if (drivers_peripheral_audio_feature_alsa_lib) {
       defines += [ "ALSA_LIB_MODE" ]
     }
 
diff --git a/audio/hdi_service/BUILD.gn b/audio/hdi_service/BUILD.gn
index 8b586eb70320216f7f744877536e658c50ac48b3..99c6ce82e1e3eabc527a626066f838ef5c0c472b 100644
--- a/audio/hdi_service/BUILD.gn
+++ b/audio/hdi_service/BUILD.gn
@@ -12,7 +12,6 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 group("idl_audio") {
@@ -22,7 +21,7 @@ group("idl_audio") {
     "primary_impl:audio_primary_impl_vendor",
   ]
 
-  if (drivers_peripheral_audio_community) {
+  if (drivers_peripheral_audio_feature_community) {
     deps += [
       "pathselect:audio_path_select",
       "supportlibs:audio_capture_adapter",
diff --git a/audio/hdi_service/pathselect/BUILD.gn b/audio/hdi_service/pathselect/BUILD.gn
index 2b0db78b88a2827f42647560a3f6101cd47ea328..735acb44ec67ec13b9b39c37cdbfe48cfa20e1cc 100644
--- a/audio/hdi_service/pathselect/BUILD.gn
+++ b/audio/hdi_service/pathselect/BUILD.gn
@@ -34,7 +34,7 @@ ohos_shared_library("audio_path_select") {
   if (enable_audio_hal_hdf_log) {
     defines += [ "AUDIO_HDF_LOG" ]
   }
-  if (drivers_peripheral_audio_alsa_lib) {
+  if (drivers_peripheral_audio_feature_alsa_lib) {
     defines += [ "ALSA_LIB_MODE" ]
   }
   if (is_standard_system) {
diff --git a/audio/hdi_service/primary_impl/BUILD.gn b/audio/hdi_service/primary_impl/BUILD.gn
index ae34e1a7caf30df076f0e13cd24dc977d94f4535..bf99f58cc2cc507b2c950479842243a1418d597d 100644
--- a/audio/hdi_service/primary_impl/BUILD.gn
+++ b/audio/hdi_service/primary_impl/BUILD.gn
@@ -17,7 +17,7 @@ import("//drivers/peripheral/audio/audio.gni")
 
 ohos_shared_library("audio_primary_impl_vendor") {
   defines = []
-  if (drivers_peripheral_audio_community) {
+  if (drivers_peripheral_audio_feature_community) {
     sources = [
       "src/audio_adapter.c",
       "src/audio_adapter_info_common.c",
@@ -36,7 +36,7 @@ ohos_shared_library("audio_primary_impl_vendor") {
       "//drivers/peripheral/audio/hdi_service/vendor_interface/utils",
     ]
 
-    if (drivers_peripheral_audio_hal_notsupport_pathselect) {
+    if (drivers_peripheral_audio_feature_hal_notsupport_pathselect) {
       defines += [ "AUDIO_HAL_NOTSUPPORT_PATHSELECT" ]
     }
   } else {
diff --git a/audio/hdi_service/supportlibs/BUILD.gn b/audio/hdi_service/supportlibs/BUILD.gn
index e8fc21f7397b2c85a1980562242402acfe6104c0..778379b8045c3de57c6ea6fc2066a98c92851151 100644
--- a/audio/hdi_service/supportlibs/BUILD.gn
+++ b/audio/hdi_service/supportlibs/BUILD.gn
@@ -77,7 +77,7 @@ if (defined(ohos_lite)) {
     sources = [
       "//drivers/peripheral/audio/hdi_service/primary_impl/src/audio_common.c",
     ]
-    if (drivers_peripheral_audio_alsa_lib) {
+    if (drivers_peripheral_audio_feature_alsa_lib) {
       sources += [
         "//drivers/peripheral/audio/supportlibs/alsa_adapter/src/alsa_lib_capture.c",
         "//drivers/peripheral/audio/supportlibs/alsa_adapter/src/alsa_lib_common.c",
@@ -98,7 +98,7 @@ if (defined(ohos_lite)) {
       "//drivers/peripheral/audio/hdi_service/vendor_interface/utils",
     ]
 
-    if (drivers_peripheral_audio_alsa_lib) {
+    if (drivers_peripheral_audio_feature_alsa_lib) {
       include_dirs += [
         "//third_party/cJSON",
         "//third_party/alsa-lib/include",
@@ -136,7 +136,7 @@ if (defined(ohos_lite)) {
     sources = [
       "//drivers/peripheral/audio/hdi_service/primary_impl/src/audio_common.c",
     ]
-    if (drivers_peripheral_audio_alsa_lib) {
+    if (drivers_peripheral_audio_feature_alsa_lib) {
       sources += [
         "//drivers/peripheral/audio/supportlibs/alsa_adapter/src/alsa_lib_common.c",
         "//drivers/peripheral/audio/supportlibs/alsa_adapter/src/alsa_lib_render.c",
@@ -158,7 +158,7 @@ if (defined(ohos_lite)) {
       "//drivers/peripheral/audio/hdi_service/vendor_interface/utils",
     ]
 
-    if (drivers_peripheral_audio_alsa_lib) {
+    if (drivers_peripheral_audio_feature_alsa_lib) {
       include_dirs += [
         "//third_party/cJSON",
         "//third_party/alsa-lib/include",
diff --git a/audio/supportlibs/BUILD.gn b/audio/supportlibs/BUILD.gn
index 68fe69d202bdf11a2ae2fadd8101d923f7a07e2b..aa2b0543d113ef60b9ca4f0f09042462dfb50ac3 100644
--- a/audio/supportlibs/BUILD.gn
+++ b/audio/supportlibs/BUILD.gn
@@ -12,7 +12,6 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 config("audio_interface_config") {
@@ -89,7 +88,7 @@ if (defined(ohos_lite)) {
   ohos_shared_library("hdi_audio_interface_lib_capture") {
     sources =
         [ "//drivers/peripheral/audio/hal/hdi_passthrough/src/audio_common.c" ]
-    if (drivers_peripheral_audio_alsa_lib) {
+    if (drivers_peripheral_audio_feature_alsa_lib) {
       sources += [
         "//drivers/peripheral/audio/supportlibs/alsa_adapter/src/alsa_lib_capture.c",
         "//drivers/peripheral/audio/supportlibs/alsa_adapter/src/alsa_lib_common.c",
@@ -116,7 +115,7 @@ if (defined(ohos_lite)) {
       defines = [ "AUDIO_HDF_LOG" ]
     }
 
-    if (drivers_peripheral_audio_alsa_lib) {
+    if (drivers_peripheral_audio_feature_alsa_lib) {
       include_dirs += [
         "//third_party/alsa-lib/include",
         "//drivers/peripheral/audio/supportlibs/alsa_adapter/include",
@@ -147,7 +146,7 @@ if (defined(ohos_lite)) {
   ohos_shared_library("hdi_audio_interface_lib_render") {
     sources =
         [ "//drivers/peripheral/audio/hal/hdi_passthrough/src/audio_common.c" ]
-    if (drivers_peripheral_audio_alsa_lib) {
+    if (drivers_peripheral_audio_feature_alsa_lib) {
       sources += [
         "//drivers/peripheral/audio/supportlibs/alsa_adapter/src/alsa_lib_common.c",
         "//drivers/peripheral/audio/supportlibs/alsa_adapter/src/alsa_lib_render.c",
@@ -175,7 +174,7 @@ if (defined(ohos_lite)) {
       defines = [ "AUDIO_HDF_LOG" ]
     }
 
-    if (drivers_peripheral_audio_alsa_lib) {
+    if (drivers_peripheral_audio_feature_alsa_lib) {
       include_dirs += [
         "//drivers/peripheral/audio/supportlibs/alsa_adapter/include",
         "//third_party/alsa-lib/include",
diff --git a/audio/test/BUILD.gn b/audio/test/BUILD.gn
index f31a56e7e890139d0e3c52aa6b9ffd7801f95630..a83e9dc32419f718f993a5c80cda154c4587ce38 100644
--- a/audio/test/BUILD.gn
+++ b/audio/test/BUILD.gn
@@ -12,7 +12,6 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 if (defined(ohos_lite)) {
@@ -21,7 +20,7 @@ if (defined(ohos_lite)) {
   }
 } else {
   group("audio_test_entry") {
-    if (drivers_peripheral_audio_hdf_proxy_stub == true) {
+    if (drivers_peripheral_audio_feature_hdf_proxy_stub == true) {
       testonly = true
       deps = [
         "benchmarktest:hdf_audio_benchmark_test",
@@ -29,7 +28,7 @@ if (defined(ohos_lite)) {
         "unittest:audiotest",
       ]
 
-      if (!drivers_peripheral_audio_rich_device) {
+      if (!drivers_peripheral_audio_feature_rich_device) {
         deps += [ "fuzztest:fuzztest" ]
       }
     }
diff --git a/audio/test/fuzztest/BUILD.gn b/audio/test/fuzztest/BUILD.gn
index 48add439cf1a4d38e51c7d96386895fe027a9354..5595ba4f428a38024d32a33d406d633829dda012 100644
--- a/audio/test/fuzztest/BUILD.gn
+++ b/audio/test/fuzztest/BUILD.gn
@@ -14,7 +14,6 @@
 import("//build/config/features.gni")
 import("//build/test.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 
 group("fuzztest") {
   testonly = true
diff --git a/audio/test/fuzztest/adm_fuzzer/BUILD.gn b/audio/test/fuzztest/adm_fuzzer/BUILD.gn
index ffb2392fe33137eb78ec623e060203f939b2f151..2dc9e56ae41ae8e5ec134f76bb2c4ee013161a8a 100644
--- a/audio/test/fuzztest/adm_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/adm_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 group("adm_fuzzer") {
diff --git a/audio/test/fuzztest/adm_fuzzer/audioadmdispatchercapturecmdid_fuzzer/BUILD.gn b/audio/test/fuzztest/adm_fuzzer/audioadmdispatchercapturecmdid_fuzzer/BUILD.gn
index 221ab348131665195bd5aeec9c86d544a21acc6a..77616ac5b757f789f225b2c66b7b23341d7b46b7 100644
--- a/audio/test/fuzztest/adm_fuzzer/audioadmdispatchercapturecmdid_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/adm_fuzzer/audioadmdispatchercapturecmdid_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/adm_fuzzer/audioadmdispatchercontrolcmdid_fuzzer/BUILD.gn b/audio/test/fuzztest/adm_fuzzer/audioadmdispatchercontrolcmdid_fuzzer/BUILD.gn
index bd9e226dd26b696dab842a5dff011b890a881ada..4ffe01e9f3348509842b23e1403b2c67dd995446 100644
--- a/audio/test/fuzztest/adm_fuzzer/audioadmdispatchercontrolcmdid_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/adm_fuzzer/audioadmdispatchercontrolcmdid_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/adm_fuzzer/audioadmdispatcherrendercmdid_fuzzer/BUILD.gn b/audio/test/fuzztest/adm_fuzzer/audioadmdispatcherrendercmdid_fuzzer/BUILD.gn
index ca067c67f882935014eacb1465e3af36b50d90bc..154a0707761073e09db7104d7bdf3fda8df91217 100644
--- a/audio/test/fuzztest/adm_fuzzer/audioadmdispatcherrendercmdid_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/adm_fuzzer/audioadmdispatcherrendercmdid_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/adm_fuzzer/audiointerfacelibctlcapturecmdid_fuzzer/BUILD.gn b/audio/test/fuzztest/adm_fuzzer/audiointerfacelibctlcapturecmdid_fuzzer/BUILD.gn
index 72ebed73a741d9315a7406b9152a80762e7434d3..9ced76a8fa0e29d80c699b187cdc39aa902f69bd 100644
--- a/audio/test/fuzztest/adm_fuzzer/audiointerfacelibctlcapturecmdid_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/adm_fuzzer/audiointerfacelibctlcapturecmdid_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/adm_fuzzer/audiointerfacelibctlrendercmdid_fuzzer/BUILD.gn b/audio/test/fuzztest/adm_fuzzer/audiointerfacelibctlrendercmdid_fuzzer/BUILD.gn
index c8f05c71a97c95657f67fe55a6fe49321f460e35..a0b42589194f711895e54a5c482a4a61ea35a228 100644
--- a/audio/test/fuzztest/adm_fuzzer/audiointerfacelibctlrendercmdid_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/adm_fuzzer/audiointerfacelibctlrendercmdid_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/adm_fuzzer/audiointerfaceliboutputcapturecmdid_fuzzer/BUILD.gn b/audio/test/fuzztest/adm_fuzzer/audiointerfaceliboutputcapturecmdid_fuzzer/BUILD.gn
index c612cd2fa4b39eb41574f5920a4a4900890ca4f9..c3f4d4266f2f9f7b47ce5d145de1bdc0bdabcac5 100644
--- a/audio/test/fuzztest/adm_fuzzer/audiointerfaceliboutputcapturecmdid_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/adm_fuzzer/audiointerfaceliboutputcapturecmdid_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/adm_fuzzer/audiointerfaceliboutputrendercmdid_fuzzer/BUILD.gn b/audio/test/fuzztest/adm_fuzzer/audiointerfaceliboutputrendercmdid_fuzzer/BUILD.gn
index c24a2e365bb0f36202c5709d6155c581a3522c79..6a08375c78b0e2d78a88d7fd44ba79b827a39d43 100644
--- a/audio/test/fuzztest/adm_fuzzer/audiointerfaceliboutputrendercmdid_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/adm_fuzzer/audiointerfaceliboutputrendercmdid_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/adm_fuzzer/audiolibaudiobindservicecapture_fuzzer/BUILD.gn b/audio/test/fuzztest/adm_fuzzer/audiolibaudiobindservicecapture_fuzzer/BUILD.gn
index 1dad6df5c825209d24560dc77d7428abd449325c..76a4e2cc03bafd0b9cf86bbb98d57e05f192f1a9 100644
--- a/audio/test/fuzztest/adm_fuzzer/audiolibaudiobindservicecapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/adm_fuzzer/audiolibaudiobindservicecapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/adm_fuzzer/audiolibaudiobindservicerender_fuzzer/BUILD.gn b/audio/test/fuzztest/adm_fuzzer/audiolibaudiobindservicerender_fuzzer/BUILD.gn
index 19e7ea672b00ac419eebabb711df81fa7071bf0d..cb2b363e14c0c4200e157f41b79fc7753e4be71a 100644
--- a/audio/test/fuzztest/adm_fuzzer/audiolibaudiobindservicerender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/adm_fuzzer/audiolibaudiobindservicerender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/audio_hdi_fuzzer/BUILD.gn b/audio/test/fuzztest/audio_hdi_fuzzer/BUILD.gn
index af6faf4467f4f50440a1f7c9702bb14a9f3121ce..8a12d1baf0d0acc3b5bacb22297df626c35d9653 100644
--- a/audio/test/fuzztest/audio_hdi_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/audio_hdi_fuzzer/BUILD.gn
@@ -14,7 +14,6 @@
 import("//build/config/features.gni")
 import("//build/test.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 
 group("audio_hdi_fuzzer") {
   testonly = true
diff --git a/audio/test/fuzztest/audio_hdi_fuzzer/audioadapter_fuzzer/BUILD.gn b/audio/test/fuzztest/audio_hdi_fuzzer/audioadapter_fuzzer/BUILD.gn
index aa9fec39f7cceaf481225d1ef3e34389e8dcabbb..06f3ea0b5720992cb94d7e296e3a7cb9b9b2018b 100644
--- a/audio/test/fuzztest/audio_hdi_fuzzer/audioadapter_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/audio_hdi_fuzzer/audioadapter_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "drivers_peripheral_audio/audio"
diff --git a/audio/test/fuzztest/audio_hdi_fuzzer/audiocapture_fuzzer/BUILD.gn b/audio/test/fuzztest/audio_hdi_fuzzer/audiocapture_fuzzer/BUILD.gn
index cd81d6f37c3afb0a2135caa5173dbe224c3a51c8..3b43843e031ec0b0ffeced7ef46422a98593ca53 100644
--- a/audio/test/fuzztest/audio_hdi_fuzzer/audiocapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/audio_hdi_fuzzer/audiocapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "drivers_peripheral_audio/audio"
diff --git a/audio/test/fuzztest/audio_hdi_fuzzer/audiomanager_fuzzer/BUILD.gn b/audio/test/fuzztest/audio_hdi_fuzzer/audiomanager_fuzzer/BUILD.gn
index 218b78445a64ffdeecdf7f369376a9c9301a4a08..ea9375aebffefb944a49d22592f92a98d8d39dd5 100644
--- a/audio/test/fuzztest/audio_hdi_fuzzer/audiomanager_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/audio_hdi_fuzzer/audiomanager_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "drivers_peripheral_audio/audio"
diff --git a/audio/test/fuzztest/audio_hdi_fuzzer/audiorender_fuzzer/BUILD.gn b/audio/test/fuzztest/audio_hdi_fuzzer/audiorender_fuzzer/BUILD.gn
index a1dc706aa3b728a0675682e439379c1d1462fb6d..13c0b933aab074185b5078b3ee9f0badef01eb8c 100644
--- a/audio/test/fuzztest/audio_hdi_fuzzer/audiorender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/audio_hdi_fuzzer/audiorender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "drivers_peripheral_audio/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/BUILD.gn
index 971e49f4a07ba72e06fef7b564717525a9a4dfce..3347bd4defaf95cee234e45c969321a6922212d3 100644
--- a/audio/test/fuzztest/hdi_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/BUILD.gn
@@ -14,7 +14,6 @@
 import("//build/config/features.gni")
 import("//build/test.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 
 group("hdi_fuzzer") {
   testonly = true
diff --git a/audio/test/fuzztest/hdi_fuzzer/adapter/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/adapter/BUILD.gn
index 04ee47aaad1f59c5dad6b666674ae4829bedc997..ef89b37f529ec31ca2562e1d8e7c65f6112af40b 100644
--- a/audio/test/fuzztest/hdi_fuzzer/adapter/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/adapter/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/test.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 group("adapter") {
diff --git a/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreatecaptureattrs_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreatecaptureattrs_fuzzer/BUILD.gn
index 03a20f6e8778980f48acba5381d9d7d634c65b4c..6fef34d11b47eb3e5ea7ad022b831673590b9d51 100644
--- a/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreatecaptureattrs_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreatecaptureattrs_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreatecapturedesc_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreatecapturedesc_fuzzer/BUILD.gn
index c428f46c9de08af752e399acb31b379afd6186d5..328db07d7f73a81e6ef91499acb4db832bed1232 100644
--- a/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreatecapturedesc_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreatecapturedesc_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreaterenderattrs_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreaterenderattrs_fuzzer/BUILD.gn
index cb53c83e99f79f888d37ca83f23098e32e30c1d9..01f6a991a49cfa455fb2603f265b9c2736a47f77 100644
--- a/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreaterenderattrs_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreaterenderattrs_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreaterenderdesc_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreaterenderdesc_fuzzer/BUILD.gn
index 30ed541d7666a1c40f45e80703bc13b34580fbc1..c75fc7822d4391ef508c223d8c35594274c97903 100644
--- a/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreaterenderdesc_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/adapter/audiocreaterenderdesc_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/adapter/audiodestroycapturecapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/adapter/audiodestroycapturecapture_fuzzer/BUILD.gn
index 41575bfb3e82251c19a73292302e1d0fbbeb46a6..4cd3213eead9305a1c5cd67c15ee8594da0ed058 100644
--- a/audio/test/fuzztest/hdi_fuzzer/adapter/audiodestroycapturecapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/adapter/audiodestroycapturecapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/adapter/audiodestroyrenderrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/adapter/audiodestroyrenderrender_fuzzer/BUILD.gn
index 058f2502e52c08a9175d57960a402a189a9e933c..d590285478e59080858755ad45a7d0131f2d0a56 100644
--- a/audio/test/fuzztest/hdi_fuzzer/adapter/audiodestroyrenderrender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/adapter/audiodestroyrenderrender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/adapter/audiogetalladapters_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/adapter/audiogetalladapters_fuzzer/BUILD.gn
index dc9ca760b3a1f4f40e85a1433350fea5c7464b04..5b544e59db2e31c876ba0983846a33ca6d906531 100755
--- a/audio/test/fuzztest/hdi_fuzzer/adapter/audiogetalladapters_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/adapter/audiogetalladapters_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/adapter/audioloadadapterdesc_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/adapter/audioloadadapterdesc_fuzzer/BUILD.gn
index 7953b9747566a59b9d27ef068c3a3e77d736ba04..809b2f306a40ef4bcfdf4732b09d93e0f7f31988 100644
--- a/audio/test/fuzztest/hdi_fuzzer/adapter/audioloadadapterdesc_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/adapter/audioloadadapterdesc_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/adapter/audioloadadaptermanager_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/adapter/audioloadadaptermanager_fuzzer/BUILD.gn
index 82c1b275bc0f38ed43bae3721de664bf0d0eeff7..b018082004905853d736c05b1ce97728ecfe61dd 100644
--- a/audio/test/fuzztest/hdi_fuzzer/adapter/audioloadadaptermanager_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/adapter/audioloadadaptermanager_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/adapter/audiounloadadaptermanager_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/adapter/audiounloadadaptermanager_fuzzer/BUILD.gn
index 0a91b29d22f14280b824561682c88f45cd5910ff..c62ac095c2ed2b5983af2269c73307d3d610a2bb 100644
--- a/audio/test/fuzztest/hdi_fuzzer/adapter/audiounloadadaptermanager_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/adapter/audiounloadadaptermanager_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/BUILD.gn
index 5b325e5d49628b34f6d60336ee7870eb53b76ab9..9a6cde4ebda78e4ff8d16ebb3923747c95607c76 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/test.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 group("attribute") {
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturegetmmappositioncapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturegetmmappositioncapture_fuzzer/BUILD.gn
index 565cb63ef5c96565c82f922c709b1fc36928bb02..858675d6f2e7c50a4922423cae49111e91906d88 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturegetmmappositioncapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturegetmmappositioncapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbuffercapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbuffercapture_fuzzer/BUILD.gn
index 528cdf873e752e6bec01cb59586fd0a377182bd1..0f0a35d3196ea720a194d9737a8fbcf534622cc7 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbuffercapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbuffercapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbufferdesc_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbufferdesc_fuzzer/BUILD.gn
index 136580b13a981d30c074207375633850e0c56e6a..91d311acc764a039728ee32df8d8cbd17283b5f3 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbufferdesc_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbufferdesc_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbufferreqsize_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbufferreqsize_fuzzer/BUILD.gn
index 0245225a7e405edda35b166b4776ce386bad869c..7f1feb0ed5fd295315c67e328b3aedc3eb0f7b86 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbufferreqsize_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocapturereqmmapbufferreqsize_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilitycapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilitycapture_fuzzer/BUILD.gn
index b908894e0b706f8147c453218be18cc4c993c150..9960d88a768c4e43134d39243bf2a7c52ce7b8a2 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilitycapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilitycapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilitycapturescene_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilitycapturescene_fuzzer/BUILD.gn
index 8ac9d4238968762718e9a4405d483ae3214772b8..2ef0d9734276b285699a97ecfa742b5bd6463a28 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilitycapturescene_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilitycapturescene_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilityrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilityrender_fuzzer/BUILD.gn
index 7f12aaae48cf222fa63c3c0d632be853bb6783ab..c82574e658ebf9e467a43353c224511ebeb68c1a 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilityrender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilityrender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilityrenderscene_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilityrenderscene_fuzzer/BUILD.gn
index bd4a0276b204ceb5d947ad81e768d2ca13072a00..fd8108f21ba55260fc4b4f221ef813ac786a8a6b 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilityrenderscene_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiocheckscenecapabilityrenderscene_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetcurrentchannelidcapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetcurrentchannelidcapture_fuzzer/BUILD.gn
index 408ac6d4369a5e5b57f06b62c298de80cb85c185..71f9275b880c45883826d1ef628831adbdef9d94 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetcurrentchannelidcapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetcurrentchannelidcapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetcurrentchannelidrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetcurrentchannelidrender_fuzzer/BUILD.gn
index 9b573408e34e1b2a8c62287cd5c43c1e84561853..e358f11015a02ca09ae1068c158bb235ec43e4d2 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetcurrentchannelidrender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetcurrentchannelidrender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframecountcapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframecountcapture_fuzzer/BUILD.gn
index a361bae0a357e108761a249d08c9b4b52c156499..b3150e6f481f77dba710a74f247b6f8be492edfd 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframecountcapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframecountcapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframecountrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframecountrender_fuzzer/BUILD.gn
index ae0e43fc452cd04ae9773b8a3c192eecab933937..5bae499dac48c40fc943a9b8a8700a034c2f7d75 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframecountrender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframecountrender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframesizecapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframesizecapture_fuzzer/BUILD.gn
index 20fbe244f6577068e9215e263e347b27bf9d6c28..4cad852319e54520722590438267f4c71a4c671a 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframesizecapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframesizecapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframesizerender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframesizerender_fuzzer/BUILD.gn
index 4565cc4c6a919c8a5367438d508f4d229c839a2c..e04dff345ae219247739e65f5488f59798833a35 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframesizerender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetframesizerender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetsampleattributescapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetsampleattributescapture_fuzzer/BUILD.gn
index 38a8e42cf81f474c1ac698c6a6d4855568d5388d..af89dfab69c6e9155b6e12ce352c6e92a10b6d1a 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetsampleattributescapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetsampleattributescapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetsampleattributesrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetsampleattributesrender_fuzzer/BUILD.gn
index 15c4c455185261acb1e95f7a46ac2e52ee3b77d9..6512f7d02cec778d3165b10f73bd80cc620fd6f8 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetsampleattributesrender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiogetsampleattributesrender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiorendergetmmappositionrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiorendergetmmappositionrender_fuzzer/BUILD.gn
index 10412c576fcab77aaeb7d6296a9cce2b63de7d48..729e848b8f6f0fa48ae183568a56e3cf8b0aba3b 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiorendergetmmappositionrender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiorendergetmmappositionrender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferdesc_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferdesc_fuzzer/BUILD.gn
index 83b08acc588ccfe22e369258db4b270169dcc578..538a89d4c81c4dc3dead0aee1ed390cca8b4eb13 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferdesc_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferdesc_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferrender_fuzzer/BUILD.gn
index 0ab7954e82cf779c7eff64c3554f3d361f77ed8f..17c2f8b45b97baa4deb49d25604433c9394205a3 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferrender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferrender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferreqsize_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferreqsize_fuzzer/BUILD.gn
index 5f30aab249081e76ca738c55ecbed3e1a2d74962..a57eb54bb4d1d92cfa84d8ac113e65009ea65cc5 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferreqsize_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiorenderreqmmapbufferreqsize_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenecapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenecapture_fuzzer/BUILD.gn
index 5b4da1b5d655fa6376211fcf4654e6aa78605da6..ec02f0862771e128f58a9b99e5f8b396f4596b02 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenecapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenecapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenecapturescene_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenecapturescene_fuzzer/BUILD.gn
index 90d3b9df4c3692d81b62f84379d3709eaa3b5ebf..cccadbc9579a2d1cc277ec721e0ecb451075ae5d 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenecapturescene_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenecapturescene_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenerender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenerender_fuzzer/BUILD.gn
index d6d880f89c976bbe7026f0c1e2034596c5c725e4..12f9f1d4c5770d2ebe1b2d71cea8a587c67b4d37 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenerender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenerender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenerenderscene_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenerenderscene_fuzzer/BUILD.gn
index fdce58a121586a84d9015ab3fd110e1ff730c069..35c1b9d08306a94323cc99e65931bda8e131f360 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenerenderscene_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audioselectscenerenderscene_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributescapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributescapture_fuzzer/BUILD.gn
index c883b432b0d7275e8bd10eb6865a01793f45fcc6..89d688bbddf6801bcc4d78865cef8ab4230261aa 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributescapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributescapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributescaptureattrs_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributescaptureattrs_fuzzer/BUILD.gn
index 7376df04c687e202826a27f13a85ac0e8e7e900d..cf1b0d43041495a0a41f212222c2525916558409 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributescaptureattrs_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributescaptureattrs_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributesrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributesrender_fuzzer/BUILD.gn
index 5d4957a22b0d7c7ebad29b8fa86df03b70d590c0..a1165f87137277d6f293fece2ccd888dc763246e 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributesrender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributesrender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributesrenderattrs_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributesrenderattrs_fuzzer/BUILD.gn
index 5eddc17931f536e424c9e4f66353b3cbb6889dc4..db4a2bcc2d8fd47b7849da9b6102e3bee7bb7e83 100644
--- a/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributesrenderattrs_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/attribute/audiosetsampleattributesrenderattrs_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/capture/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/capture/BUILD.gn
index 501d7954c3a5b6aecbfda27b04d97ae70b16624c..179fd7891d55ab56375aa9a85643e306ca96bf3c 100644
--- a/audio/test/fuzztest/hdi_fuzzer/capture/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/capture/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/test.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 group("capture") {
diff --git a/audio/test/fuzztest/hdi_fuzzer/capture/audiocaptureframecapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/capture/audiocaptureframecapture_fuzzer/BUILD.gn
index 5fcac13dd152fdc3d5540e70ac3345b250d3836e..c9c6000c9199ba3f13f4f110795d9e39c35fbe7a 100644
--- a/audio/test/fuzztest/hdi_fuzzer/capture/audiocaptureframecapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/capture/audiocaptureframecapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/capture/audiocaptureframerequestbytes_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/capture/audiocaptureframerequestbytes_fuzzer/BUILD.gn
index 27ff96b49931f670d7e728d49204c080971cbd33..0158e23f717c7ce738a83ba7306da73dccfd9e5e 100644
--- a/audio/test/fuzztest/hdi_fuzzer/capture/audiocaptureframerequestbytes_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/capture/audiocaptureframerequestbytes_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/capture/audiogetcapturepositioncapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/capture/audiogetcapturepositioncapture_fuzzer/BUILD.gn
index 8be5c0d1330b3e8855b09de6cd60ec6a68f9c5a3..0f714b51b8976e3c3d483abe0ef444b9719a8d81 100644
--- a/audio/test/fuzztest/hdi_fuzzer/capture/audiogetcapturepositioncapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/capture/audiogetcapturepositioncapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/capture/audiogetextraparamscapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/capture/audiogetextraparamscapture_fuzzer/BUILD.gn
index 5218b30547698c50d74e7578fd4e9ca73e8c7e88..ff0910292ee88f7af92a65c535a7a126ab0dfbe5 100644
--- a/audio/test/fuzztest/hdi_fuzzer/capture/audiogetextraparamscapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/capture/audiogetextraparamscapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/capture/audiosetextraparamscapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/capture/audiosetextraparamscapture_fuzzer/BUILD.gn
index 8a6bc556f036894addc3583ccea04c1ce6346761..41bcef673ddc9184cf7ecafaa6e5ed24e665f03a 100644
--- a/audio/test/fuzztest/hdi_fuzzer/capture/audiosetextraparamscapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/capture/audiosetextraparamscapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/capture/audiosetextraparamscapturekeyvaluelist_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/capture/audiosetextraparamscapturekeyvaluelist_fuzzer/BUILD.gn
index f0e33f7437ac0e45cdb62ec9ad3744f7cceb9fe1..92dd7a6e6e456bb79560b5784d4d319d6dde73f4 100644
--- a/audio/test/fuzztest/hdi_fuzzer/capture/audiosetextraparamscapturekeyvaluelist_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/capture/audiosetextraparamscapturekeyvaluelist_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/control/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/control/BUILD.gn
index 5b3c944e0cb084e40a536c665f105344c0b5323a..09ab118ec944ec0e9b00654d27d9840f4aa3bab3 100644
--- a/audio/test/fuzztest/hdi_fuzzer/control/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/control/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/test.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 group("control") {
diff --git a/audio/test/fuzztest/hdi_fuzzer/control/audioflushcapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/control/audioflushcapture_fuzzer/BUILD.gn
index eebf57f7df1be042a91f1d93a7e72cd43b0ae279..c907f4e9b439b4748c6878b31daff505789d06de 100644
--- a/audio/test/fuzztest/hdi_fuzzer/control/audioflushcapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/control/audioflushcapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/control/audioflushrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/control/audioflushrender_fuzzer/BUILD.gn
index 3398c1f5e51c31faecca8c2d3592fa560064de2b..57357ee98d689b3911a54eb6f414ca3542331adb 100644
--- a/audio/test/fuzztest/hdi_fuzzer/control/audioflushrender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/control/audioflushrender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/control/audiopausecapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/control/audiopausecapture_fuzzer/BUILD.gn
index 7fc12ffac71bbd63d7a7cc5beb39b63990b10f4f..264d95c11cc4b4dbec8a890c469b3c7527d52f99 100644
--- a/audio/test/fuzztest/hdi_fuzzer/control/audiopausecapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/control/audiopausecapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/control/audiopauserender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/control/audiopauserender_fuzzer/BUILD.gn
index 2768e936aa1bef849bf5a2d96eafeceb89ccbcdb..3443d62ee6021a8cde22f807b8920e2ab0f3eb1f 100644
--- a/audio/test/fuzztest/hdi_fuzzer/control/audiopauserender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/control/audiopauserender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/control/audioresumecapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/control/audioresumecapture_fuzzer/BUILD.gn
index 889bd7671ad066d4b8851fea1f794c5a3df5d33f..7e286b5269f152a5cc2d93f99328e5f75f38c83a 100644
--- a/audio/test/fuzztest/hdi_fuzzer/control/audioresumecapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/control/audioresumecapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/control/audioresumerender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/control/audioresumerender_fuzzer/BUILD.gn
index 569fc2c8aa436a795832e952508eb9815cd3bb83..8c89fef5f9bfc57608239d6e8d82e26f18557ba9 100644
--- a/audio/test/fuzztest/hdi_fuzzer/control/audioresumerender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/control/audioresumerender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/control/audiostartcapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/control/audiostartcapture_fuzzer/BUILD.gn
index 07bc487a117228e7568118a5291376a92d905eff..a2632f8714085b6809cf58ce4fc644b4ee693582 100644
--- a/audio/test/fuzztest/hdi_fuzzer/control/audiostartcapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/control/audiostartcapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/control/audiostartrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/control/audiostartrender_fuzzer/BUILD.gn
index 8acb499cd1cb1810f558cbe6c0c4cfb587206a4f..da73f9f78597d862e9bf01832cef4843eb72d14a 100644
--- a/audio/test/fuzztest/hdi_fuzzer/control/audiostartrender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/control/audiostartrender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/control/audiostopcapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/control/audiostopcapture_fuzzer/BUILD.gn
index 2f5f7b5a567f52d86df2d39eba848c6b727be3ae..7dfa8f734eccd6d4253b5965687e02d1b0fd49ca 100644
--- a/audio/test/fuzztest/hdi_fuzzer/control/audiostopcapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/control/audiostopcapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/control/audiostoprender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/control/audiostoprender_fuzzer/BUILD.gn
index f166b34a85f0f95a303cb5b5b687d8d4cca19b19..f78b944ac2c7746fd99bba558b74732918ce3dc6 100644
--- a/audio/test/fuzztest/hdi_fuzzer/control/audiostoprender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/control/audiostoprender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/render/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/BUILD.gn
index f9f0bf9069986b24e8ec16023035ae7358535f47..b4186f1dc0004c87d8c36f55c7f19e1224e421a7 100644
--- a/audio/test/fuzztest/hdi_fuzzer/render/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/render/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/test.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 group("render") {
diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiogetchannelmoderender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiogetchannelmoderender_fuzzer/BUILD.gn
index a5e6419f9ced4b846af5b1d6dd39a59324edc181..4711d4042bf903802c93196931019334c5a40d48 100644
--- a/audio/test/fuzztest/hdi_fuzzer/render/audiogetchannelmoderender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/render/audiogetchannelmoderender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiogetextraparamsrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiogetextraparamsrender_fuzzer/BUILD.gn
index 2fc2f5bbd2460d21d98cc847b3dd5c896286d629..d3260c99f4f3a0f50d2bdfab38b4c72a7b2857d2 100644
--- a/audio/test/fuzztest/hdi_fuzzer/render/audiogetextraparamsrender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/render/audiogetextraparamsrender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiogetlatencyrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiogetlatencyrender_fuzzer/BUILD.gn
index f899b3fbf0cd571058f246dbd5a95c8e36f63a43..21828c400968e2f6de28acf21a7cf2c60050b7ca 100644
--- a/audio/test/fuzztest/hdi_fuzzer/render/audiogetlatencyrender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/render/audiogetlatencyrender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiogetrenderpositionrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiogetrenderpositionrender_fuzzer/BUILD.gn
index 358408ddbef5b26a83b4d4ca7fc60457efa6d88c..d40bbb15e73b1fd83f197c893e98e368df34b898 100644
--- a/audio/test/fuzztest/hdi_fuzzer/render/audiogetrenderpositionrender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/render/audiogetrenderpositionrender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiogetrenderspeedrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiogetrenderspeedrender_fuzzer/BUILD.gn
index 924488472d69955cd230c9bb25263f9711b6d4c3..ed0c3b3c1a5b03e0d2c80bfe585c9926ad898dea 100644
--- a/audio/test/fuzztest/hdi_fuzzer/render/audiogetrenderspeedrender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/render/audiogetrenderspeedrender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiorenderframerender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiorenderframerender_fuzzer/BUILD.gn
index f8a179c0ef6c87f28852f52e8dcd75c35c6e49a5..8bb6001272b081b86d67ad590a483e692b84cd19 100644
--- a/audio/test/fuzztest/hdi_fuzzer/render/audiorenderframerender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/render/audiorenderframerender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiorenderframerequestbytes_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiorenderframerequestbytes_fuzzer/BUILD.gn
index bbbc25aa7e98d1b836d099165480a490c0cf454d..9e012379d3bb15a3dd7bfc710b19c46a4c9ff7fe 100644
--- a/audio/test/fuzztest/hdi_fuzzer/render/audiorenderframerequestbytes_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/render/audiorenderframerequestbytes_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiosetchannelmoderender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiosetchannelmoderender_fuzzer/BUILD.gn
index f0a622491bee85d7b734af27fc997f7c71ddf432..34516e51055233e7456544ca0e8aa1bfe0ccdcc0 100644
--- a/audio/test/fuzztest/hdi_fuzzer/render/audiosetchannelmoderender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/render/audiosetchannelmoderender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiosetextraparamsrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiosetextraparamsrender_fuzzer/BUILD.gn
index c73b8fd2c8054260ae41109a81e84e24d3e5e57b..1b31acf3e6958e582abd186b1fb5feac050f1eec 100644
--- a/audio/test/fuzztest/hdi_fuzzer/render/audiosetextraparamsrender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/render/audiosetextraparamsrender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiosetextraparamsrenderkeyvaluelist_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiosetextraparamsrenderkeyvaluelist_fuzzer/BUILD.gn
index 3f12842a16ba64ecb6e95bb7bc09375367187fd8..734fd18603d790b3c566f3ef09e47dbc0e84aae3 100644
--- a/audio/test/fuzztest/hdi_fuzzer/render/audiosetextraparamsrenderkeyvaluelist_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/render/audiosetextraparamsrenderkeyvaluelist_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiosetrenderspeedrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiosetrenderspeedrender_fuzzer/BUILD.gn
index f840fb1a9580c3aac6fd5d3f0fb6933034f6b6f7..9bbd6cdf9ba7e039d71cdbb6c0d54a3cda6baad3 100644
--- a/audio/test/fuzztest/hdi_fuzzer/render/audiosetrenderspeedrender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/render/audiosetrenderspeedrender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/render/audiosetrenderspeedspeed_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/render/audiosetrenderspeedspeed_fuzzer/BUILD.gn
index e2ebfba351afa6f022dbd50e49ea5e13f2efb2ed..08915e796e6545aaff51a5a3d4c5bb3ab9e2cd58 100644
--- a/audio/test/fuzztest/hdi_fuzzer/render/audiosetrenderspeedspeed_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/render/audiosetrenderspeedspeed_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/BUILD.gn
index fa657029880406faa217e2b586c04d8fd64ca3fb..8944cf62031f101f492b32a733c1e8c5dddd4d2b 100644
--- a/audio/test/fuzztest/hdi_fuzzer/volume/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/volume/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/test.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 group("volume") {
diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgaincapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgaincapture_fuzzer/BUILD.gn
index e910dd497803798548b37b3c4344001227981186..603adedb0519147baf8d1c1b3aea5beda8d61fa5 100644
--- a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgaincapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgaincapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainrender_fuzzer/BUILD.gn
index 581910a6c350c5c8065478e731de889971f0cb54..c5dc281123b74b31951813c4e1f82a3fa65a9da2 100644
--- a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainrender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainrender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainthresholdcapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainthresholdcapture_fuzzer/BUILD.gn
index f70f51f51401713b1e1da895657f6ed61c1dc7e5..88847abc9e49d1cc1bb7ce8efa4df44d97a1534c 100644
--- a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainthresholdcapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainthresholdcapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainthresholdrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainthresholdrender_fuzzer/BUILD.gn
index cbc59bcc3741ab95b1adf76e6c7d95085cad2d74..9a85fb1806621988525bfa0f016dd283e69895ce 100644
--- a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainthresholdrender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetgainthresholdrender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetmutecapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetmutecapture_fuzzer/BUILD.gn
index 825e7f9e1807917ffe4c22902b8388d2652d0988..d94c91c90f17fb8f8f831e2efaee52129bcc874e 100644
--- a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetmutecapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetmutecapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetmuterender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetmuterender_fuzzer/BUILD.gn
index 77580403e4fcf68662cbc1a263e29884ac7e887c..d5d7cd010b76b40bf067f49e33479b3533ea2521 100644
--- a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetmuterender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetmuterender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetvolumecapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetvolumecapture_fuzzer/BUILD.gn
index ce516c4ea4b56d78766a783d48d4eef5fb11212d..df80e718b8e5da3c9eb99c64e0647e75a4525e51 100644
--- a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetvolumecapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetvolumecapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetvolumerender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetvolumerender_fuzzer/BUILD.gn
index 4400196a5a03ecaae0bc35497d29247f468ac954..332743f91eecf24304b949fbfd3d1d316fb22de7 100644
--- a/audio/test/fuzztest/hdi_fuzzer/volume/audiogetvolumerender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiogetvolumerender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgaincapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgaincapture_fuzzer/BUILD.gn
index 63fda02ed88e2ddc7d14a72727bd484197bd01d6..ff8fc91789ffaae2160e17a1d4987a3ad72b8acd 100644
--- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgaincapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgaincapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgaincapturegain_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgaincapturegain_fuzzer/BUILD.gn
index 65d1f2b8ad8e078de3c53907294d754589943fdd..fbd20e043e5a1d975d7688357124e62dd588e2d3 100644
--- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgaincapturegain_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgaincapturegain_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgainrender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgainrender_fuzzer/BUILD.gn
index a37cc56af1081eda95ab3fb7d23df71f6b484525..b92148d288733be550dc42747f3656152d866e8a 100644
--- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgainrender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgainrender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgainrendergain_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgainrendergain_fuzzer/BUILD.gn
index d9f1b731e38850e278161c9c2de90a936607783d..5c67107acd7aeedad9de23bdaa62d4a39229788d 100644
--- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgainrendergain_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetgainrendergain_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmutecapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmutecapture_fuzzer/BUILD.gn
index debc8ed234b2c9bfdc0e1b6815e8fdb7b74a02d4..2b5c7a99bce29d042bf5686cfdf291e7d60181b3 100644
--- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmutecapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmutecapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmutecapturemute_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmutecapturemute_fuzzer/BUILD.gn
index cc375fcbd828e2b302c5dac06784af1c6f4a600d..c3f016329eb2b76e4dad61e67057143fa0831189 100644
--- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmutecapturemute_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmutecapturemute_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmuterender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmuterender_fuzzer/BUILD.gn
index dd18c1685d4d141e72126368aa7397f2f40fabf2..35ec22cd7d6aa4ac2cb6b8d2be2d415ea0785622 100644
--- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmuterender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmuterender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmuterendermute_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmuterendermute_fuzzer/BUILD.gn
index 5a494bf9d113ad7ccbcaff95eaa0e64e5960ed93..dcbe80bf9ced3eb5237413de0f05a02bdb411140 100644
--- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmuterendermute_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetmuterendermute_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumecapture_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumecapture_fuzzer/BUILD.gn
index 92fe81ab232cfaa730231405d4582c67a8bc5dd7..a3abf08ff2cd1e1ca9cefb78f1fbd59d75511db4 100644
--- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumecapture_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumecapture_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumecapturevolume_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumecapturevolume_fuzzer/BUILD.gn
index 34049b437818d2e962c7409064168efc8ab2b6cd..e5c8f4436da7c52fdc7b1a049861754160d66aa5 100644
--- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumecapturevolume_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumecapturevolume_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumerender_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumerender_fuzzer/BUILD.gn
index a49fbced664b8787be381260a935a9967a535cdb..f3cd4c31962890f68ff21ee95222ac4ffb32b99f 100644
--- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumerender_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumerender_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumerendervolume_fuzzer/BUILD.gn b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumerendervolume_fuzzer/BUILD.gn
index 40efbf46c082b2335fe0257113a8d1f6fdfb9e8a..baaf2dc08581e0d17b3261214d828daa0816d6f9 100644
--- a/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumerendervolume_fuzzer/BUILD.gn
+++ b/audio/test/fuzztest/hdi_fuzzer/volume/audiosetvolumerendervolume_fuzzer/BUILD.gn
@@ -13,7 +13,6 @@
 import("//build/config/features.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("//drivers/peripheral/audio/audio.gni")
 
 module_output_path = "hdf/audio"
diff --git a/audio/test/sample/BUILD.gn b/audio/test/sample/BUILD.gn
index 5c4f3083deafe1c9108d15fc905f1da522162e1e..e439e0f364f3e0442ce1bacf3e5ad74478e78312 100644
--- a/audio/test/sample/BUILD.gn
+++ b/audio/test/sample/BUILD.gn
@@ -15,7 +15,6 @@ hdf_audio_path = "./../.."
 
 import("//build/ohos.gni")
 import("//drivers/hdf_core/adapter/uhdf2/hdi.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("$hdf_audio_path/audio.gni")
 
 if (defined(ohos_lite)) {
@@ -107,7 +106,7 @@ if (defined(ohos_lite)) {
 
     defines = []
 
-    if (drivers_peripheral_audio_alsa_lib) {
+    if (drivers_peripheral_audio_feature_alsa_lib) {
       defines += [ "ALSA_LIB_MODE" ]
     }
 
@@ -168,7 +167,7 @@ if (defined(ohos_lite)) {
     ]
 
     defines = [ "IDL_SAMPLE" ]
-    if (drivers_peripheral_audio_alsa_lib) {
+    if (drivers_peripheral_audio_feature_alsa_lib) {
       defines += [ "ALSA_LIB_MODE" ]
     }
 
@@ -200,7 +199,7 @@ if (defined(ohos_lite)) {
     ]
 
     defines = [ "IDL_SAMPLE" ]
-    if (drivers_peripheral_audio_alsa_lib) {
+    if (drivers_peripheral_audio_feature_alsa_lib) {
       defines += [ "ALSA_LIB_MODE" ]
     }
 
@@ -223,7 +222,7 @@ if (defined(ohos_lite)) {
 }
 
 group("audio_sample") {
-  if (drivers_peripheral_audio_hdf_proxy_stub == true) {
+  if (drivers_peripheral_audio_feature_hdf_proxy_stub == true) {
     deps = [
       ":audio_sample_capture",
       ":audio_sample_render",
@@ -233,7 +232,7 @@ group("audio_sample") {
 
 group("idl_audio_sample") {
   if (!defined(ohos_lite)) {
-    if (drivers_peripheral_audio_hdf_proxy_stub == true) {
+    if (drivers_peripheral_audio_feature_hdf_proxy_stub == true) {
       deps = [
         ":idl_capture",
         ":idl_render",
diff --git a/audio/test/systemtest/BUILD.gn b/audio/test/systemtest/BUILD.gn
index 20432e119ac80ba3144ff28ccfc0086fa632ed07..247467949acb4f8fd8ec55fbd9db94c0c2e43828 100644
--- a/audio/test/systemtest/BUILD.gn
+++ b/audio/test/systemtest/BUILD.gn
@@ -30,10 +30,10 @@ if (defined(ohos_lite)) {
   group("systemtest") {
     testonly = true
     deps = []
-    if (drivers_peripheral_audio_rich_device) {
+    if (drivers_peripheral_audio_feature_rich_device) {
       # deps += [ "hdi_advance:hdi_advance" ]
     }
-    if (drivers_peripheral_audio_full_test_suite) {
+    if (drivers_peripheral_audio_feature_full_test_suite) {
       deps += [
         "hdi:hdi",
         "hdi_service:hdi_service_st",
@@ -41,10 +41,10 @@ if (defined(ohos_lite)) {
 
         #"audio_adapter:audio_adapter",
       ]
-      if (!defined(drivers_peripheral_audio_alsa_lib) ||
-          drivers_peripheral_audio_alsa_lib == false) {
+      if (!defined(drivers_peripheral_audio_feature_alsa_lib) ||
+          drivers_peripheral_audio_feature_alsa_lib == false) {
         deps += [
-          "adm:adm",
+          #"adm:adm",
           "audio_function:function",
         ]
       }
diff --git a/audio/test/systemtest/README_zh.md b/audio/test/systemtest/README_zh.md
index c601c4af3a01efdcd8052d6cabf251e6d7c1328c..c9f0a13aa0f988b03070c39acf381606a7d1ff16 100644
--- a/audio/test/systemtest/README_zh.md
+++ b/audio/test/systemtest/README_zh.md
@@ -250,8 +250,8 @@ LIB层存在硬件耦合接口：为音量，增益，场景切换相关接口
       "../../../common/hdi_common/src/audio_hdi_common.cpp",
       "../../../common/lib_common/src/audio_lib_common.cpp",
     ]
-    #drivers_peripheral_audio_alsa_lib
-    if(defined(drivers_peripheral_audio_alsa_lib) && drivers_peripheral_audio_alsa_lib == true) {
+    #drivers_peripheral_audio_feature_alsa_lib
+    if(defined(drivers_peripheral_audio_feature_alsa_lib) && drivers_peripheral_audio_feature_alsa_lib == true) {
       sources += ["src/audio_alsa_libcapture_test.cpp"]
     }else {
       sources += ["src/audio_libcapture_test.cpp"]
@@ -332,7 +332,7 @@ LIB层存在硬件耦合接口：为音量，增益，场景切换相关接口
 
   ````bash 
     #gn内添加编译宏ALSA_LIB_MODE用于区分测试用例
-    if(defined(drivers_peripheral_audio_alsa_lib) && drivers_peripheral_audio_alsa_lib == true) {
+    if(defined(drivers_peripheral_audio_feature_alsa_lib) && drivers_peripheral_audio_feature_alsa_lib == true) {
       defines += [ "ALSA_LIB_MODE" ]
     }
     #测试用例代码内使用示例
@@ -343,7 +343,7 @@ LIB层存在硬件耦合接口：为音量，增益，场景切换相关接口
     EXPECT_EQ(AUDIO_HAL_ERR_INTERNAL, ret);
 #endif
   ````
-<b>注：编译ALSA测试用例是需要设置ALSA编译选项，由drivers_peripheral_audio_alsa_lib编译选项控制，当"drivers_peripheral_audio_alsa_lib = true"表示编译ALSA模式测试用例，编译配置文件路径为./drivers/peripheral/audio/audio.gni文件内。</b>
+<b>注：编译ALSA测试用例是需要设置ALSA编译选项，由drivers_peripheral_audio_feature_alsa_lib编译选项控制，当"drivers_peripheral_audio_feature_alsa_lib = true"表示编译ALSA模式测试用例，编译配置文件路径为./drivers/peripheral/audio/audio.gni文件内。</b>
 ##### 1.2.3 录音阈值上报测试用例
 
   码云上音频驱动模型默认不编译录音阈值上报功能代码，因此该功能对应的测试套（hdf_audio_threshold_report_test）默认不编译，如需编译需要手动修改gn文件，去掉“#”字符注释。gn文件路径为./audio_function/BUILD.gn
diff --git a/audio/test/systemtest/adm/BUILD.gn b/audio/test/systemtest/adm/BUILD.gn
index bc83ef3a6677a06a28b18f8d7fc4893f260630cc..b4fb5aafac88a86c8aa1a8ca57a23e1d0b9d3062 100644
--- a/audio/test/systemtest/adm/BUILD.gn
+++ b/audio/test/systemtest/adm/BUILD.gn
@@ -15,7 +15,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
   import("./../../../audio.gni")
 }
 
diff --git a/audio/test/systemtest/adm/audio_adm_interface/BUILD.gn b/audio/test/systemtest/adm/audio_adm_interface/BUILD.gn
index 7b7ee874c61ad53c8aae7411887bbac1febd43b0..10e4abc3aebf7337e2e6cb5cbe81219a8b9afe9b 100644
--- a/audio/test/systemtest/adm/audio_adm_interface/BUILD.gn
+++ b/audio/test/systemtest/adm/audio_adm_interface/BUILD.gn
@@ -18,7 +18,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 import("$hdf_audio_path/audio.gni")
 
@@ -82,8 +81,5 @@ if (defined(ohos_lite)) {
     if (enable_audio_adm_service) {
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if ("${product_name}" == "rk3568") {
-      defines += [ "PRODUCT_RK3568" ]
-    }
   }
 }
diff --git a/audio/test/systemtest/audio_adapter/BUILD.gn b/audio/test/systemtest/audio_adapter/BUILD.gn
index bf921ffad9615e8936c9a7ea68952c5179187d27..9d42a35173e59fd8482cd5bb338907dba4501581 100644
--- a/audio/test/systemtest/audio_adapter/BUILD.gn
+++ b/audio/test/systemtest/audio_adapter/BUILD.gn
@@ -12,7 +12,6 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("./../../../audio.gni")
 
 ###########################end###########################
diff --git a/audio/test/systemtest/audio_adapter/audio_usb/BUILD.gn b/audio/test/systemtest/audio_adapter/audio_usb/BUILD.gn
index 880ad904bf7dc23355ce8028b4a058af3fbc822d..78f16cf421c5eddd922b2bb4741066c3e32483d4 100644
--- a/audio/test/systemtest/audio_adapter/audio_usb/BUILD.gn
+++ b/audio/test/systemtest/audio_adapter/audio_usb/BUILD.gn
@@ -15,7 +15,7 @@ hdf_audio_path = "./../../../.."
 hdf_audio_test_path = "./../.."
 
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
+
 import("$hdf_audio_path/audio.gni")
 
 module_output_path = "drivers_peripheral_audio/audio"
@@ -50,7 +50,7 @@ ohos_systemtest("hdf_audio_usb_adapter_test") {
     deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
     defines += [ "AUDIO_ADM_SERVICE" ]
   }
-  if (!drivers_peripheral_audio_rich_device) {
+  if (!drivers_peripheral_audio_feature_rich_device) {
     defines += [ "FEATURE_SMALL_DEVICE" ]
   }
 }
diff --git a/audio/test/systemtest/audio_function/BUILD.gn b/audio/test/systemtest/audio_function/BUILD.gn
index 4ebb87e2064a7e6420adf3d1811ead74e94d62a3..ae8d57857b016e815eb61dc7cff251a1a0e673af 100644
--- a/audio/test/systemtest/audio_function/BUILD.gn
+++ b/audio/test/systemtest/audio_function/BUILD.gn
@@ -15,7 +15,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
   import("./../../../audio.gni")
 }
 
@@ -29,18 +28,5 @@ group("function") {
       "audio_pathroute:hdf_audio_hdi_path_route_test",
       "audio_smartpa:hdf_audio_smartpa_test",
     ]
-  } else {
-    #deps += [ "audio_threshold_report:hdf_audio_threshold_report_test" ]
-    if ("${product_name}" == "hispark_taurus_standard") {
-      if (enable_audio_adm_passthrough) {
-        deps += [
-          "audio_pathroute:hdf_audio_hdi_path_route_test",
-          "audio_smartpa:hdf_audio_smartpa_test",
-        ]
-      }
-      if (enable_audio_adm_service) {
-        deps += [ "audio_smartpa:hdf_audio_smartpa_test" ]
-      }
-    }
   }
 }
diff --git a/audio/test/systemtest/audio_function/audio_pathroute/BUILD.gn b/audio/test/systemtest/audio_function/audio_pathroute/BUILD.gn
index bad2466c745d575887f2cc743a28efdba9d687e4..2d3c399973dfe145e5ea6c6be0c19b5d0e274c83 100644
--- a/audio/test/systemtest/audio_function/audio_pathroute/BUILD.gn
+++ b/audio/test/systemtest/audio_function/audio_pathroute/BUILD.gn
@@ -18,7 +18,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 import("$hdf_audio_path/audio.gni")
 
@@ -45,7 +44,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
       "//third_party/bounds_checking_function:libsec_shared",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -84,7 +83,7 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
diff --git a/audio/test/systemtest/audio_function/audio_server/BUILD.gn b/audio/test/systemtest/audio_function/audio_server/BUILD.gn
index 0b401d622429649c5d9ab6ff0e7fc06f54ac0434..98841cbdca9fac374a162aef5edc22480721748e 100644
--- a/audio/test/systemtest/audio_function/audio_server/BUILD.gn
+++ b/audio/test/systemtest/audio_function/audio_server/BUILD.gn
@@ -18,7 +18,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 import("$hdf_audio_path/audio.gni")
 
@@ -42,7 +41,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/manager:hdf_core",
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -83,7 +82,7 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
diff --git a/audio/test/systemtest/audio_function/audio_smartpa/BUILD.gn b/audio/test/systemtest/audio_function/audio_smartpa/BUILD.gn
index aa5d62160e747c48d10ca9bb72852a4b1bfc2a7c..11b16247efd5c3168a64d98f2fcccbfacbdd6807 100644
--- a/audio/test/systemtest/audio_function/audio_smartpa/BUILD.gn
+++ b/audio/test/systemtest/audio_function/audio_smartpa/BUILD.gn
@@ -18,7 +18,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 import("$hdf_audio_path/audio.gni")
 
@@ -53,7 +52,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
       "//third_party/bounds_checking_function:libsec_shared",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -105,7 +104,7 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
diff --git a/audio/test/systemtest/audio_function/audio_threshold_report/BUILD.gn b/audio/test/systemtest/audio_function/audio_threshold_report/BUILD.gn
index 646082e489a66721fa9ea4d1a0d0b2f0cb3eb34c..b1b5eb93adbf175cf240fe866ef8847e0f6dc0bb 100644
--- a/audio/test/systemtest/audio_function/audio_threshold_report/BUILD.gn
+++ b/audio/test/systemtest/audio_function/audio_threshold_report/BUILD.gn
@@ -16,7 +16,6 @@ hdf_audio_test_path = "./../.."
 
 if (!defined(ohos_lite)) {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 import("$hdf_audio_path/audio.gni")
 if (!defined(ohos_lite)) {
@@ -61,7 +60,7 @@ if (!defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
diff --git a/audio/test/systemtest/hdi/BUILD.gn b/audio/test/systemtest/hdi/BUILD.gn
index f0dd9b157e3b67eea0cd7a75410346d0392eff35..42e42811d3a25e98870199718fa43342963f6390 100644
--- a/audio/test/systemtest/hdi/BUILD.gn
+++ b/audio/test/systemtest/hdi/BUILD.gn
@@ -15,7 +15,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
   import("./../../../audio.gni")
 }
 
@@ -25,10 +24,10 @@ group("hdi") {
   }
   deps = [
     "common:hdi_common",
-    "hardwaredependence:hdi_hardwaredependence",
+    #"hardwaredependence:hdi_hardwaredependence",
   ]
-  if (!defined(drivers_peripheral_audio_alsa_lib) ||
-      drivers_peripheral_audio_alsa_lib == false) {
+  if (!defined(drivers_peripheral_audio_feature_alsa_lib) ||
+      drivers_peripheral_audio_feature_alsa_lib == false) {
     deps += [ "hdiperformace:hdi_performace" ]
     if (!defined(ohos_lite)) {
       if (enable_audio_adm_service) {
diff --git a/audio/test/systemtest/hdi/common/BUILD.gn b/audio/test/systemtest/hdi/common/BUILD.gn
index 43aa9e5c73e99c8dda1c250e235c736eadbcc3e6..0774e1862e1a4f7346e0c0a45b680c57d6495ef7 100644
--- a/audio/test/systemtest/hdi/common/BUILD.gn
+++ b/audio/test/systemtest/hdi/common/BUILD.gn
@@ -15,7 +15,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
   import("./../../../../audio.gni")
 }
 
diff --git a/audio/test/systemtest/hdi/common/adapter/BUILD.gn b/audio/test/systemtest/hdi/common/adapter/BUILD.gn
index 2d388bfd7a3343627d41d7658d37a3caeeb6f6f5..bcdc2bf3f648ac8c491ce2f516506957e367e4b5 100644
--- a/audio/test/systemtest/hdi/common/adapter/BUILD.gn
+++ b/audio/test/systemtest/hdi/common/adapter/BUILD.gn
@@ -18,7 +18,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 import("$hdf_audio_path/audio.gni")
 
@@ -42,7 +41,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/manager:hdf_core",
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -79,7 +78,7 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
diff --git a/audio/test/systemtest/hdi/common/capture/BUILD.gn b/audio/test/systemtest/hdi/common/capture/BUILD.gn
index a3718b72420d239789854c2bd66ddec01661093e..a3b82304358c45fc5a1ca6559fb36bbd29b5c459 100644
--- a/audio/test/systemtest/hdi/common/capture/BUILD.gn
+++ b/audio/test/systemtest/hdi/common/capture/BUILD.gn
@@ -18,7 +18,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 import("$hdf_audio_path/audio.gni")
 
@@ -42,7 +41,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/manager:hdf_core",
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -65,7 +64,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/manager:hdf_core",
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -88,7 +87,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/manager:hdf_core",
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -111,7 +110,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/manager:hdf_core",
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -134,7 +133,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/manager:hdf_core",
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -171,11 +170,11 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if (defined(drivers_peripheral_audio_alsa_lib) &&
-        drivers_peripheral_audio_alsa_lib == true) {
+    if (defined(drivers_peripheral_audio_feature_alsa_lib) &&
+        drivers_peripheral_audio_feature_alsa_lib == true) {
       defines += [ "ALSA_LIB_MODE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -209,11 +208,11 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if (defined(drivers_peripheral_audio_alsa_lib) &&
-        drivers_peripheral_audio_alsa_lib == true) {
+    if (defined(drivers_peripheral_audio_feature_alsa_lib) &&
+        drivers_peripheral_audio_feature_alsa_lib == true) {
       defines += [ "ALSA_LIB_MODE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -247,11 +246,11 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if (defined(drivers_peripheral_audio_alsa_lib) &&
-        drivers_peripheral_audio_alsa_lib == true) {
+    if (defined(drivers_peripheral_audio_feature_alsa_lib) &&
+        drivers_peripheral_audio_feature_alsa_lib == true) {
       defines += [ "ALSA_LIB_MODE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -285,11 +284,11 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if (defined(drivers_peripheral_audio_alsa_lib) &&
-        drivers_peripheral_audio_alsa_lib == true) {
+    if (defined(drivers_peripheral_audio_feature_alsa_lib) &&
+        drivers_peripheral_audio_feature_alsa_lib == true) {
       defines += [ "ALSA_LIB_MODE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -323,7 +322,7 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
diff --git a/audio/test/systemtest/hdi/common/manager/BUILD.gn b/audio/test/systemtest/hdi/common/manager/BUILD.gn
index fc6865eb1eaa1bbd9f9f580fef919f28aafff094..5e693c1739e3a23da54a137cbb42df44e9948941 100644
--- a/audio/test/systemtest/hdi/common/manager/BUILD.gn
+++ b/audio/test/systemtest/hdi/common/manager/BUILD.gn
@@ -18,7 +18,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 import("$hdf_audio_path/audio.gni")
 
@@ -42,7 +41,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/manager:hdf_core",
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -80,7 +79,7 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
diff --git a/audio/test/systemtest/hdi/common/render/BUILD.gn b/audio/test/systemtest/hdi/common/render/BUILD.gn
index 09dd538395b8864ea55300910f6ba12c090f487b..b9cc74a9a8ba4ba2004f51ff3f5c65aa741338d9 100644
--- a/audio/test/systemtest/hdi/common/render/BUILD.gn
+++ b/audio/test/systemtest/hdi/common/render/BUILD.gn
@@ -18,7 +18,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 import("$hdf_audio_path/audio.gni")
 
@@ -42,7 +41,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/manager:hdf_core",
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -66,7 +65,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/manager:hdf_core",
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -89,7 +88,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/manager:hdf_core",
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -113,7 +112,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/manager:hdf_core",
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -136,7 +135,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/manager:hdf_core",
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -174,7 +173,7 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -210,7 +209,7 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -246,14 +245,11 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if ("${product_name}" == "rk3568") {
-      defines += [ "PRODUCT_RK3568" ]
-    }
-    if (defined(drivers_peripheral_audio_alsa_lib) &&
-        drivers_peripheral_audio_alsa_lib == true) {
+    if (defined(drivers_peripheral_audio_feature_alsa_lib) &&
+        drivers_peripheral_audio_feature_alsa_lib == true) {
       defines += [ "ALSA_LIB_MODE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -289,11 +285,11 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if (defined(drivers_peripheral_audio_alsa_lib) &&
-        drivers_peripheral_audio_alsa_lib == true) {
+    if (defined(drivers_peripheral_audio_feature_alsa_lib) &&
+        drivers_peripheral_audio_feature_alsa_lib == true) {
       defines += [ "ALSA_LIB_MODE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -329,14 +325,11 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if ("${product_name}" == "rk3568") {
-      defines += [ "PRODUCT_RK3568" ]
-    }
-    if (defined(drivers_peripheral_audio_alsa_lib) &&
-        drivers_peripheral_audio_alsa_lib == true) {
+    if (defined(drivers_peripheral_audio_feature_alsa_lib) &&
+        drivers_peripheral_audio_feature_alsa_lib == true) {
       defines += [ "ALSA_LIB_MODE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
diff --git a/audio/test/systemtest/hdi/hardwaredependence/BUILD.gn b/audio/test/systemtest/hdi/hardwaredependence/BUILD.gn
index 5c9368a03494a2a8f3db4eec0ce836b4e2452fd3..7d0fab88674fdf40d9be4b231c6ba03e3e671565 100644
--- a/audio/test/systemtest/hdi/hardwaredependence/BUILD.gn
+++ b/audio/test/systemtest/hdi/hardwaredependence/BUILD.gn
@@ -15,7 +15,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
   import("./../../../../audio.gni")
 }
 
diff --git a/audio/test/systemtest/hdi/hardwaredependence/capture/BUILD.gn b/audio/test/systemtest/hdi/hardwaredependence/capture/BUILD.gn
index 9f75730b02633dadd96e2302545fb2be575f7758..14f1a298f6e0d4783fd979f85db58de428e74425 100644
--- a/audio/test/systemtest/hdi/hardwaredependence/capture/BUILD.gn
+++ b/audio/test/systemtest/hdi/hardwaredependence/capture/BUILD.gn
@@ -18,7 +18,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 import("$hdf_audio_path/audio.gni")
 
@@ -41,7 +40,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/manager:hdf_core",
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -77,14 +76,11 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if ("${product_name}" == "rk3568") {
-      defines += [ "PRODUCT_RK3568" ]
-    }
-    if (defined(drivers_peripheral_audio_alsa_lib) &&
-        drivers_peripheral_audio_alsa_lib == true) {
+    if (defined(drivers_peripheral_audio_feature_alsa_lib) &&
+        drivers_peripheral_audio_feature_alsa_lib == true) {
       defines += [ "ALSA_LIB_MODE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
diff --git a/audio/test/systemtest/hdi/hardwaredependence/render/BUILD.gn b/audio/test/systemtest/hdi/hardwaredependence/render/BUILD.gn
index 72ae39ddfad8c20f1e788e2b1ebb1f6802da1293..1653e75621c4b94f229d6802b375d408ad7a2bca 100644
--- a/audio/test/systemtest/hdi/hardwaredependence/render/BUILD.gn
+++ b/audio/test/systemtest/hdi/hardwaredependence/render/BUILD.gn
@@ -18,7 +18,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 import("$hdf_audio_path/audio.gni")
 
@@ -42,7 +41,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/manager:hdf_core",
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -79,14 +78,11 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if ("${product_name}" == "rk3568") {
-      defines += [ "PRODUCT_RK3568" ]
-    }
-    if (defined(drivers_peripheral_audio_alsa_lib) &&
-        drivers_peripheral_audio_alsa_lib == true) {
+    if (defined(drivers_peripheral_audio_feature_alsa_lib) &&
+        drivers_peripheral_audio_feature_alsa_lib == true) {
       defines += [ "ALSA_LIB_MODE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
diff --git a/audio/test/systemtest/hdi/hdiperformace/BUILD.gn b/audio/test/systemtest/hdi/hdiperformace/BUILD.gn
index 6c6b1dba04c1daedceb1fc1638bb2ef5f586acc5..dc2b72d0e7eb9389d5e257891e2bea4d61b70a22 100644
--- a/audio/test/systemtest/hdi/hdiperformace/BUILD.gn
+++ b/audio/test/systemtest/hdi/hdiperformace/BUILD.gn
@@ -18,7 +18,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 import("$hdf_audio_path/audio.gni")
 
@@ -42,7 +41,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/manager:hdf_core",
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -66,7 +65,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/manager:hdf_core",
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -104,7 +103,7 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -139,7 +138,7 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
diff --git a/audio/test/systemtest/hdi/hdireliability/BUILD.gn b/audio/test/systemtest/hdi/hdireliability/BUILD.gn
index 2b1eb288853a49747aa74705ebe1b330c542a5e9..a888b266a020e5e901793a2aa64386bf21168c11 100644
--- a/audio/test/systemtest/hdi/hdireliability/BUILD.gn
+++ b/audio/test/systemtest/hdi/hdireliability/BUILD.gn
@@ -18,7 +18,7 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
+
   import("$hdf_audio_path/audio.gni")
 }
 
@@ -44,7 +44,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
       "//third_party/bounds_checking_function:libsec_shared",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -69,7 +69,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
       "//third_party/bounds_checking_function:libsec_shared",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -95,7 +95,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
       "//third_party/bounds_checking_function:libsec_shared",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -121,7 +121,7 @@ if (defined(ohos_lite)) {
       "//drivers/hdf_core/adapter/uhdf/posix:hdf_posix_osal",
       "//third_party/bounds_checking_function:libsec_shared",
     ]
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines = [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -161,7 +161,7 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -198,7 +198,7 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -235,7 +235,7 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
@@ -273,7 +273,7 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if (!drivers_peripheral_audio_rich_device) {
+    if (!drivers_peripheral_audio_feature_rich_device) {
       defines += [ "FEATURE_SMALL_DEVICE" ]
     }
   }
diff --git a/audio/test/systemtest/hdi_advance/BUILD.gn b/audio/test/systemtest/hdi_advance/BUILD.gn
index cf1a7ef9154fe0b0a969b3e95f089cf4d14bd6ab..ddf96c4e1416a1978aaf92c64761de6206a208da 100644
--- a/audio/test/systemtest/hdi_advance/BUILD.gn
+++ b/audio/test/systemtest/hdi_advance/BUILD.gn
@@ -15,7 +15,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
   import("./../../../audio.gni")
 }
 
diff --git a/audio/test/systemtest/hdi_advance/common/BUILD.gn b/audio/test/systemtest/hdi_advance/common/BUILD.gn
index 22ccc432162aa8fae460bcc72bfc5728c79c1db9..d6b3e8d0f4a853a816ad208bb97613d9150ed161 100644
--- a/audio/test/systemtest/hdi_advance/common/BUILD.gn
+++ b/audio/test/systemtest/hdi_advance/common/BUILD.gn
@@ -15,7 +15,7 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
+
   import("./../../../../audio.gni")
 }
 
diff --git a/audio/test/systemtest/hdi_advance/common/adapter/BUILD.gn b/audio/test/systemtest/hdi_advance/common/adapter/BUILD.gn
index 61568166ef7a637e9b33f09e2912cee1b8a337ee..2edbdf60e1f6580b85ceda49b0be60dee2171dfb 100644
--- a/audio/test/systemtest/hdi_advance/common/adapter/BUILD.gn
+++ b/audio/test/systemtest/hdi_advance/common/adapter/BUILD.gn
@@ -18,7 +18,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 import("$hdf_audio_path/audio.gni")
 
diff --git a/audio/test/systemtest/hdi_advance/common/capture/BUILD.gn b/audio/test/systemtest/hdi_advance/common/capture/BUILD.gn
index 6d3f4c94812727782625294f5f196b531c0aa238..22c81511c77f1c7a707e016e0193097bc115c861 100644
--- a/audio/test/systemtest/hdi_advance/common/capture/BUILD.gn
+++ b/audio/test/systemtest/hdi_advance/common/capture/BUILD.gn
@@ -18,7 +18,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 import("$hdf_audio_path/audio.gni")
 
diff --git a/audio/test/systemtest/hdi_advance/common/manager/BUILD.gn b/audio/test/systemtest/hdi_advance/common/manager/BUILD.gn
index 36e18fdd4ab5017ae0b70b88ce81298ff1e54d01..80bde5eb751f499458c3fa9dc546f60cb550b402 100644
--- a/audio/test/systemtest/hdi_advance/common/manager/BUILD.gn
+++ b/audio/test/systemtest/hdi_advance/common/manager/BUILD.gn
@@ -18,7 +18,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 import("$hdf_audio_path/audio.gni")
 
diff --git a/audio/test/systemtest/hdi_advance/common/render/BUILD.gn b/audio/test/systemtest/hdi_advance/common/render/BUILD.gn
index 7c75c7dbe4085f8647c555ff6576e6fc32e9ed8e..4b74418a518261320e1ca99058ece44c936c3d02 100644
--- a/audio/test/systemtest/hdi_advance/common/render/BUILD.gn
+++ b/audio/test/systemtest/hdi_advance/common/render/BUILD.gn
@@ -18,7 +18,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 import("$hdf_audio_path/audio.gni")
 
@@ -188,8 +187,5 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if ("${product_name}" == "rk3568") {
-      defines += [ "PRODUCT_RK3568" ]
-    }
   }
 }
diff --git a/audio/test/systemtest/hdi_advance/hardwaredependence/BUILD.gn b/audio/test/systemtest/hdi_advance/hardwaredependence/BUILD.gn
index 617e38119712f46ab254cbaa143ed118d141a1b9..9288e4ad32799c257d668ccd8322a9f2104a3872 100644
--- a/audio/test/systemtest/hdi_advance/hardwaredependence/BUILD.gn
+++ b/audio/test/systemtest/hdi_advance/hardwaredependence/BUILD.gn
@@ -15,7 +15,7 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
+
   import("./../../../../audio.gni")
 }
 
diff --git a/audio/test/systemtest/hdi_advance/hardwaredependence/capture/BUILD.gn b/audio/test/systemtest/hdi_advance/hardwaredependence/capture/BUILD.gn
index 8ca28e638456386c4ad2498a993d9e599f2c1613..bb956d75e905f8121620c12deef8bbba897e02e2 100644
--- a/audio/test/systemtest/hdi_advance/hardwaredependence/capture/BUILD.gn
+++ b/audio/test/systemtest/hdi_advance/hardwaredependence/capture/BUILD.gn
@@ -18,7 +18,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 import("$hdf_audio_path/audio.gni")
 
@@ -74,8 +73,5 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if ("${product_name}" == "rk3568") {
-      defines += [ "PRODUCT_RK3568" ]
-    }
   }
 }
diff --git a/audio/test/systemtest/hdi_advance/hardwaredependence/render/BUILD.gn b/audio/test/systemtest/hdi_advance/hardwaredependence/render/BUILD.gn
index 082f0c6da0e23eb2b6992f4434d5ec93f1ff8098..d08a938bc4370459d92ab5eeff6b7b0064e51127 100644
--- a/audio/test/systemtest/hdi_advance/hardwaredependence/render/BUILD.gn
+++ b/audio/test/systemtest/hdi_advance/hardwaredependence/render/BUILD.gn
@@ -18,7 +18,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 import("$hdf_audio_path/audio.gni")
 
@@ -76,8 +75,5 @@ if (defined(ohos_lite)) {
       deps += [ "$hdf_audio_path/hal/hdi_binder/proxy:hdi_audio_client" ]
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if ("${product_name}" == "rk3568") {
-      defines += [ "PRODUCT_RK3568" ]
-    }
   }
 }
diff --git a/audio/test/systemtest/hdi_service/BUILD.gn b/audio/test/systemtest/hdi_service/BUILD.gn
index 70629fdfb6853ce7a71410977b91e782b6de137f..efe012013ce82ddd96c6e2bcca39556b2961a429 100644
--- a/audio/test/systemtest/hdi_service/BUILD.gn
+++ b/audio/test/systemtest/hdi_service/BUILD.gn
@@ -18,13 +18,7 @@ import("./../../../audio.gni")
 group("hdi_service_st") {
   testonly = true
   deps = [ "common:hdi_service_common" ]
-  if ("${product_name}" == "hispark_taurus_standard") {
-    deps += [ "hispark_taurus_standard:hdi_service_hardwaredependence" ]
-  }
-  if ("${product_name}" == "rk3568") {
-    deps += [ "rk3568:hdi_service_hardwaredependence" ]
-  }
-  if (drivers_peripheral_audio_alsa_lib == false) {
+  if (drivers_peripheral_audio_feature_alsa_lib == false) {
     deps += [ "hdiperformace:hdf_audio_idlhdi_performace_test" ]
   }
 }
diff --git a/audio/test/systemtest/hdi_service/common/BUILD.gn b/audio/test/systemtest/hdi_service/common/BUILD.gn
index 73480b89f2582919938e964ccbcc591de30daffc..e0cb1e283e39918bc67af5f0af09e3a2b014909d 100644
--- a/audio/test/systemtest/hdi_service/common/BUILD.gn
+++ b/audio/test/systemtest/hdi_service/common/BUILD.gn
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
+
 import("./../../../../audio.gni")
 
 group("hdi_service_common") {
diff --git a/audio/test/systemtest/hdi_service/common/capture/BUILD.gn b/audio/test/systemtest/hdi_service/common/capture/BUILD.gn
index 616b97411c921a60d8e6b8dcb07376dc2723690a..34b8c10ca509d68a0b632c7127a1659502752217 100644
--- a/audio/test/systemtest/hdi_service/common/capture/BUILD.gn
+++ b/audio/test/systemtest/hdi_service/common/capture/BUILD.gn
@@ -50,7 +50,7 @@ if (!defined(ohos_lite)) {
     if (enable_audio_adm_service) {
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if (drivers_peripheral_audio_alsa_lib == true) {
+    if (drivers_peripheral_audio_feature_alsa_lib == true) {
       defines += [ "ALSA_LIB_MODE" ]
     }
   }
diff --git a/audio/test/systemtest/hdi_service/common/render/BUILD.gn b/audio/test/systemtest/hdi_service/common/render/BUILD.gn
index 902b5e88a5d043acf0e849ca0345e96b02040b31..7cc80f87bfd1e86c1bf32c5b7af73eb0c3359f67 100644
--- a/audio/test/systemtest/hdi_service/common/render/BUILD.gn
+++ b/audio/test/systemtest/hdi_service/common/render/BUILD.gn
@@ -49,7 +49,7 @@ ohos_systemtest("hdf_audio_idlhdi_render_test") {
   if (enable_audio_adm_service) {
     defines += [ "AUDIO_ADM_SERVICE" ]
   }
-  if (drivers_peripheral_audio_alsa_lib == true) {
+  if (drivers_peripheral_audio_feature_alsa_lib == true) {
     defines += [ "ALSA_LIB_MODE" ]
   }
 }
diff --git a/audio/test/systemtest/hdi_service/hispark_taurus_standard/BUILD.gn b/audio/test/systemtest/hdi_service/hispark_taurus_standard/BUILD.gn
index 0bcedf79aaa5d6e0b61aae3d0fde317396a5d5d9..bee2329df066dad315e08af967f2dd852446ccd8 100644
--- a/audio/test/systemtest/hdi_service/hispark_taurus_standard/BUILD.gn
+++ b/audio/test/systemtest/hdi_service/hispark_taurus_standard/BUILD.gn
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
+
 import("./../../../../audio.gni")
 
 group("hdi_service_hardwaredependence") {
diff --git a/audio/test/systemtest/hdi_service/hispark_taurus_standard/capture/BUILD.gn b/audio/test/systemtest/hdi_service/hispark_taurus_standard/capture/BUILD.gn
index 7cd6a08491c471d114b346c8a70ead7d08140e3f..de1ed0ae1612ce966bb1eff450efa50c3bd9db0b 100644
--- a/audio/test/systemtest/hdi_service/hispark_taurus_standard/capture/BUILD.gn
+++ b/audio/test/systemtest/hdi_service/hispark_taurus_standard/capture/BUILD.gn
@@ -44,7 +44,7 @@ ohos_systemtest("hdf_audio_idlhdi_capture_hardware_dependence_test") {
     defines += [ "AUDIO_ADM_SERVICE" ]
   }
 
-  if (drivers_peripheral_audio_alsa_lib) {
+  if (drivers_peripheral_audio_feature_alsa_lib) {
     defines += [ "ALSA_LIB_MODE" ]
   }
 }
diff --git a/audio/test/systemtest/hdi_service/hispark_taurus_standard/render/BUILD.gn b/audio/test/systemtest/hdi_service/hispark_taurus_standard/render/BUILD.gn
index 42c9a11640b49a38f918cb722ef36d7565a961f4..39b7910220baf499234654ceea990e71c4e72414 100644
--- a/audio/test/systemtest/hdi_service/hispark_taurus_standard/render/BUILD.gn
+++ b/audio/test/systemtest/hdi_service/hispark_taurus_standard/render/BUILD.gn
@@ -45,7 +45,7 @@ ohos_systemtest("hdf_audio_idlhdi_render_hardware_dependence_test") {
   if (enable_audio_adm_service) {
     defines += [ "AUDIO_ADM_SERVICE" ]
   }
-  if (drivers_peripheral_audio_alsa_lib) {
+  if (drivers_peripheral_audio_feature_alsa_lib) {
     defines += [ "ALSA_LIB_MODE" ]
   }
 }
diff --git a/audio/test/systemtest/hdi_service/rk3568/BUILD.gn b/audio/test/systemtest/hdi_service/rk3568/BUILD.gn
index 0bcedf79aaa5d6e0b61aae3d0fde317396a5d5d9..9c8e9aeb4c9389b8daf012c267ab2ede3c6b1b97 100644
--- a/audio/test/systemtest/hdi_service/rk3568/BUILD.gn
+++ b/audio/test/systemtest/hdi_service/rk3568/BUILD.gn
@@ -12,7 +12,6 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("./../../../../audio.gni")
 
 group("hdi_service_hardwaredependence") {
diff --git a/audio/test/systemtest/hdi_service/rk3568/capture/BUILD.gn b/audio/test/systemtest/hdi_service/rk3568/capture/BUILD.gn
index 4c4fabe8c42ce43d56ceed6cb7da7ef62380b0b6..c4e39d25dacfe2162075925ec6895595145813fb 100644
--- a/audio/test/systemtest/hdi_service/rk3568/capture/BUILD.gn
+++ b/audio/test/systemtest/hdi_service/rk3568/capture/BUILD.gn
@@ -43,7 +43,7 @@ ohos_systemtest("hdf_audio_idlhdi_capture_hardware_dependence_test") {
     defines += [ "AUDIO_ADM_SERVICE" ]
   }
 
-  if (drivers_peripheral_audio_alsa_lib) {
+  if (drivers_peripheral_audio_feature_alsa_lib) {
     defines += [ "ALSA_LIB_MODE" ]
   }
 }
diff --git a/audio/test/systemtest/hdi_service/rk3568/render/BUILD.gn b/audio/test/systemtest/hdi_service/rk3568/render/BUILD.gn
index 2b8bd09f8d73166b74583b3fb062166862f0786b..c00bf00b862b8a8f014687232527a731fb50c82e 100644
--- a/audio/test/systemtest/hdi_service/rk3568/render/BUILD.gn
+++ b/audio/test/systemtest/hdi_service/rk3568/render/BUILD.gn
@@ -43,7 +43,7 @@ ohos_systemtest("hdf_audio_idlhdi_render_hardware_dependence_test") {
   if (enable_audio_adm_service) {
     defines += [ "AUDIO_ADM_SERVICE" ]
   }
-  if (drivers_peripheral_audio_alsa_lib) {
+  if (drivers_peripheral_audio_feature_alsa_lib) {
     defines += [ "ALSA_LIB_MODE" ]
   }
 }
diff --git a/audio/test/systemtest/supportlibs/BUILD.gn b/audio/test/systemtest/supportlibs/BUILD.gn
index 2900c9d63793418944b82895abe701c69f9127c2..341894094db22a0f6976d0b096ac5f0a895be894 100644
--- a/audio/test/systemtest/supportlibs/BUILD.gn
+++ b/audio/test/systemtest/supportlibs/BUILD.gn
@@ -15,7 +15,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
   import("./../../../audio.gni")
 }
 
@@ -25,8 +24,8 @@ group("supportlibs") {
     testonly = true
     if (enable_audio_adm_passthrough) {
       deps += [ "common:lib_common" ]
-      if (!defined(drivers_peripheral_audio_alsa_lib) ||
-          drivers_peripheral_audio_alsa_lib == false) {
+      if (!defined(drivers_peripheral_audio_feature_alsa_lib) ||
+          drivers_peripheral_audio_feature_alsa_lib == false) {
         deps += [ "hardwaredependence:lib_hardwaredependence" ]
       }
     }
diff --git a/audio/test/systemtest/supportlibs/common/BUILD.gn b/audio/test/systemtest/supportlibs/common/BUILD.gn
index fe83ebacf400bae698f70da30ddabc46411a8cfd..d9c88cf23182052a5eaa32824bdbc823a3ac2857 100644
--- a/audio/test/systemtest/supportlibs/common/BUILD.gn
+++ b/audio/test/systemtest/supportlibs/common/BUILD.gn
@@ -15,7 +15,7 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
+
   import("./../../../../audio.gni")
 }
 
diff --git a/audio/test/systemtest/supportlibs/common/capture/BUILD.gn b/audio/test/systemtest/supportlibs/common/capture/BUILD.gn
index bc8bbdd5759522bd069db4fad2380f12f5853fdf..8c07717a5572b578e768aa572f19a32e8648d799 100644
--- a/audio/test/systemtest/supportlibs/common/capture/BUILD.gn
+++ b/audio/test/systemtest/supportlibs/common/capture/BUILD.gn
@@ -18,7 +18,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 import("$hdf_audio_path/audio.gni")
 
@@ -61,8 +60,8 @@ if (defined(ohos_lite)) {
       "$hdf_audio_test_path/common/hdi_common/src/audio_hdi_common.cpp",
       "$hdf_audio_test_path/common/lib_common/src/audio_lib_common.cpp",
     ]
-    if (defined(drivers_peripheral_audio_alsa_lib) &&
-        drivers_peripheral_audio_alsa_lib == true) {
+    if (defined(drivers_peripheral_audio_feature_alsa_lib) &&
+        drivers_peripheral_audio_feature_alsa_lib == true) {
       sources += [ "src/audio_alsa_libcapture_test.cpp" ]
     } else {
       sources += [ "src/audio_libcapture_test.cpp" ]
diff --git a/audio/test/systemtest/supportlibs/common/render/BUILD.gn b/audio/test/systemtest/supportlibs/common/render/BUILD.gn
index 23030c018b256b4a2e92aac23381c3c37ac8c9ed..83fea3512e5bd8d0766f2a60479cb824d4b5353f 100644
--- a/audio/test/systemtest/supportlibs/common/render/BUILD.gn
+++ b/audio/test/systemtest/supportlibs/common/render/BUILD.gn
@@ -18,7 +18,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 import("$hdf_audio_path/audio.gni")
 
@@ -63,8 +62,8 @@ if (defined(ohos_lite)) {
       "$hdf_audio_test_path/common/hdi_common/src/audio_hdi_common.cpp",
       "$hdf_audio_test_path/common/lib_common/src/audio_lib_common.cpp",
     ]
-    if (defined(drivers_peripheral_audio_alsa_lib) &&
-        drivers_peripheral_audio_alsa_lib == true) {
+    if (defined(drivers_peripheral_audio_feature_alsa_lib) &&
+        drivers_peripheral_audio_feature_alsa_lib == true) {
       sources += [ "src/audio_alsa_librender_test.cpp" ]
     } else {
       sources += [ "src/audio_librender_test.cpp" ]
diff --git a/audio/test/systemtest/supportlibs/hardwaredependence/BUILD.gn b/audio/test/systemtest/supportlibs/hardwaredependence/BUILD.gn
index 0d84d453b95495e04a1411b869e5945b85cf5177..810c9db7085bc2c71f1de47cdedfe3b9d2460887 100644
--- a/audio/test/systemtest/supportlibs/hardwaredependence/BUILD.gn
+++ b/audio/test/systemtest/supportlibs/hardwaredependence/BUILD.gn
@@ -15,7 +15,7 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
+
   import("./../../../../audio.gni")
 }
 
diff --git a/audio/test/systemtest/supportlibs/hardwaredependence/capture/BUILD.gn b/audio/test/systemtest/supportlibs/hardwaredependence/capture/BUILD.gn
index df6c90fa98e816a55904454b7aec911db0b43433..babdb6dec773dc5dd68da9999f46d1938432d233 100644
--- a/audio/test/systemtest/supportlibs/hardwaredependence/capture/BUILD.gn
+++ b/audio/test/systemtest/supportlibs/hardwaredependence/capture/BUILD.gn
@@ -18,7 +18,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 import("$hdf_audio_path/audio.gni")
 
@@ -90,8 +89,5 @@ if (defined(ohos_lite)) {
     if (enable_audio_adm_service) {
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if ("${product_name}" == "rk3568") {
-      defines += [ "PRODUCT_RK3568" ]
-    }
   }
 }
diff --git a/audio/test/systemtest/supportlibs/hardwaredependence/render/BUILD.gn b/audio/test/systemtest/supportlibs/hardwaredependence/render/BUILD.gn
index 3c4267d8bfb707b5e37bc2d2b37fd8153d8c5d3c..e5cfe9d33bf97fa45a15db113cb806e39cc3d04e 100644
--- a/audio/test/systemtest/supportlibs/hardwaredependence/render/BUILD.gn
+++ b/audio/test/systemtest/supportlibs/hardwaredependence/render/BUILD.gn
@@ -18,7 +18,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 import("$hdf_audio_path/audio.gni")
 
@@ -92,8 +91,5 @@ if (defined(ohos_lite)) {
     if (enable_audio_adm_service) {
       defines += [ "AUDIO_ADM_SERVICE" ]
     }
-    if ("${product_name}" == "rk3568") {
-      defines += [ "PRODUCT_RK3568" ]
-    }
   }
 }
diff --git a/audio/test/unittest/BUILD.gn b/audio/test/unittest/BUILD.gn
index d4a32e24ea49dae370a5e86a4ac12923fe2c41b5..88e14d1cd2691b5ed447ce45a82e52b3d1f2c380 100644
--- a/audio/test/unittest/BUILD.gn
+++ b/audio/test/unittest/BUILD.gn
@@ -16,7 +16,6 @@ if (defined(ohos_lite)) {
   import("//build/lite/config/test.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 }
 
 group("audiotest") {
@@ -26,10 +25,10 @@ group("audiotest") {
   deps = [ "common:hdi_base_common" ]
 
   # hal ut
-  if (drivers_peripheral_audio_rich_device) {
+  if (drivers_peripheral_audio_feature_rich_device) {
     # deps += [ "hdi/client_advance:hdi_client_advance" ]
   }
-  if (drivers_peripheral_audio_full_test_suite) {
+  if (drivers_peripheral_audio_feature_full_test_suite) {
     deps += [
       "hdi/client:hdi_client",
       "hdi/passthrough:hdi_passthrough",
diff --git a/audio/test/unittest/common/BUILD.gn b/audio/test/unittest/common/BUILD.gn
index e4735cf74ec8a5001a5b0cda8b3077d592129b1a..9884849b27ab272415349bcf130cac1cf25ffbfb 100644
--- a/audio/test/unittest/common/BUILD.gn
+++ b/audio/test/unittest/common/BUILD.gn
@@ -12,7 +12,6 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("./../../../audio.gni")
 
 ohos_unittest("audio_ut_common_test") {
diff --git a/audio/test/unittest/hdi/client/BUILD.gn b/audio/test/unittest/hdi/client/BUILD.gn
index 2a88208842beecee7afbffa179816c0be16d0a38..5fefa20ff7f6dab9fb83cfc6dbec11c4cef3276a 100644
--- a/audio/test/unittest/hdi/client/BUILD.gn
+++ b/audio/test/unittest/hdi/client/BUILD.gn
@@ -12,11 +12,10 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("./../../../../audio.gni")
 
 group("hdi_client") {
-  if (!defined(ohos_lite) && !drivers_peripheral_audio_user_mode) {
+  if (!defined(ohos_lite) && !drivers_peripheral_audio_feature_user_mode) {
     testonly = true
     deps = [
       # "adapter:hdf_audio_proxy_adapter_test",
diff --git a/audio/test/unittest/hdi/client/adapter/BUILD.gn b/audio/test/unittest/hdi/client/adapter/BUILD.gn
index 72552268835a34b801762517408a34429def9234..6b77267f370e3e2ee2cbb14697cb9ea77b0841e1 100644
--- a/audio/test/unittest/hdi/client/adapter/BUILD.gn
+++ b/audio/test/unittest/hdi/client/adapter/BUILD.gn
@@ -15,7 +15,6 @@ hdf_audio_path = "./../../../../.."
 hdf_audio_test_path = "./.."
 
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("$hdf_audio_path/audio.gni")
 
 ohos_unittest("hdf_audio_proxy_adapter_test") {
diff --git a/audio/test/unittest/hdi/client/capture/BUILD.gn b/audio/test/unittest/hdi/client/capture/BUILD.gn
index 94f48075b4c45ad6254e83e4aa041e1a6aac4291..6a61b012a84553f3493acaaee856a1f1eb88944e 100644
--- a/audio/test/unittest/hdi/client/capture/BUILD.gn
+++ b/audio/test/unittest/hdi/client/capture/BUILD.gn
@@ -15,7 +15,6 @@ hdf_audio_path = "./../../../../.."
 hdf_audio_test_path = "./.."
 
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("$hdf_audio_path/audio.gni")
 
 ohos_unittest("hdf_audio_proxy_capture_test") {
diff --git a/audio/test/unittest/hdi/client/common/BUILD.gn b/audio/test/unittest/hdi/client/common/BUILD.gn
index 5553640002d36132f0b071d9153695c06fadc0fe..7fb0d8569bdc0930c25fad40b396016a02163a57 100644
--- a/audio/test/unittest/hdi/client/common/BUILD.gn
+++ b/audio/test/unittest/hdi/client/common/BUILD.gn
@@ -14,7 +14,6 @@
 hdf_audio_path = "./../../../../.."
 
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("$hdf_audio_path/audio.gni")
 
 ohos_unittest("hdf_audio_proxy_common_test") {
diff --git a/audio/test/unittest/hdi/client/manager/BUILD.gn b/audio/test/unittest/hdi/client/manager/BUILD.gn
index f475dd0369dbe2aa65c4f63e79773e7df8652077..97f1c09c455cf3522652ee950cd30bfbbc7d4624 100644
--- a/audio/test/unittest/hdi/client/manager/BUILD.gn
+++ b/audio/test/unittest/hdi/client/manager/BUILD.gn
@@ -15,7 +15,6 @@ hdf_audio_path = "./../../../../.."
 hdf_audio_test_path = "./.."
 
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("$hdf_audio_path/audio.gni")
 
 ohos_unittest("hdf_audio_proxy_manager_test") {
diff --git a/audio/test/unittest/hdi/client/render/BUILD.gn b/audio/test/unittest/hdi/client/render/BUILD.gn
index 37f0d706fdd7853eb7325243efd9c0a136a80a8a..9c863eb1ad04b9985127eb4325657da45791a4d1 100644
--- a/audio/test/unittest/hdi/client/render/BUILD.gn
+++ b/audio/test/unittest/hdi/client/render/BUILD.gn
@@ -15,7 +15,6 @@ hdf_audio_path = "./../../../../.."
 hdf_audio_test_path = "./.."
 
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("$hdf_audio_path/audio.gni")
 
 ohos_unittest("hdf_audio_proxy_render_test") {
diff --git a/audio/test/unittest/hdi/client_advance/BUILD.gn b/audio/test/unittest/hdi/client_advance/BUILD.gn
index ff1224b8b7c822d1028fa89bb2eff61c05282393..bb664e41fd09f56b39e9ebccb7f7b5e2ca397ab3 100644
--- a/audio/test/unittest/hdi/client_advance/BUILD.gn
+++ b/audio/test/unittest/hdi/client_advance/BUILD.gn
@@ -12,11 +12,10 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("./../../../../audio.gni")
 
 group("hdi_client_advance") {
-  if (!defined(ohos_lite) && !drivers_peripheral_audio_user_mode) {
+  if (!defined(ohos_lite) && !drivers_peripheral_audio_feature_user_mode) {
     testonly = true
     deps = [
       "adapter:hdf_audio_proxy_adapter_advance_test",
diff --git a/audio/test/unittest/hdi/client_advance/adapter/BUILD.gn b/audio/test/unittest/hdi/client_advance/adapter/BUILD.gn
index 9f91ec1e64a371745ec034274e0439b174c5f3a9..ebd61fae2b5c9c2a50914d075da199159aef7f3d 100644
--- a/audio/test/unittest/hdi/client_advance/adapter/BUILD.gn
+++ b/audio/test/unittest/hdi/client_advance/adapter/BUILD.gn
@@ -15,7 +15,6 @@ hdf_audio_path = "./../../../../.."
 hdf_audio_test_path = "./.."
 
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("$hdf_audio_path/audio.gni")
 
 ohos_unittest("hdf_audio_proxy_adapter_advance_test") {
diff --git a/audio/test/unittest/hdi/client_advance/capture/BUILD.gn b/audio/test/unittest/hdi/client_advance/capture/BUILD.gn
index 75c4a39e7634b96aa1ac3fff122256cfe4de3d39..2359b4c82d9b536a8d0509195692ca43c6857a84 100644
--- a/audio/test/unittest/hdi/client_advance/capture/BUILD.gn
+++ b/audio/test/unittest/hdi/client_advance/capture/BUILD.gn
@@ -15,7 +15,6 @@ hdf_audio_path = "./../../../../.."
 hdf_audio_test_path = "./.."
 
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("$hdf_audio_path/audio.gni")
 
 ohos_unittest("hdf_audio_proxy_capture_advance_test") {
diff --git a/audio/test/unittest/hdi/client_advance/common/BUILD.gn b/audio/test/unittest/hdi/client_advance/common/BUILD.gn
index bdb6b26e0fbb201c73d0925b9c2dfd41370614fb..0447dfcb08c1c4f47c3fc3ebffe8d5ff827b4294 100644
--- a/audio/test/unittest/hdi/client_advance/common/BUILD.gn
+++ b/audio/test/unittest/hdi/client_advance/common/BUILD.gn
@@ -14,7 +14,6 @@
 hdf_audio_path = "./../../../../.."
 
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("$hdf_audio_path/audio.gni")
 
 ohos_unittest("hdf_audio_proxy_common_advance_test") {
diff --git a/audio/test/unittest/hdi/client_advance/manager/BUILD.gn b/audio/test/unittest/hdi/client_advance/manager/BUILD.gn
index c3e6de3838d7914f14c47ca460a2c01b8d9c0c99..d9603129b8ae57a340d61744d114967f5c29cc35 100644
--- a/audio/test/unittest/hdi/client_advance/manager/BUILD.gn
+++ b/audio/test/unittest/hdi/client_advance/manager/BUILD.gn
@@ -15,7 +15,6 @@ hdf_audio_path = "./../../../../.."
 hdf_audio_test_path = "./.."
 
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("$hdf_audio_path/audio.gni")
 
 ohos_unittest("hdf_audio_proxy_manager_advance_test") {
diff --git a/audio/test/unittest/hdi/client_advance/render/BUILD.gn b/audio/test/unittest/hdi/client_advance/render/BUILD.gn
index 5aea1321c9ff6333fe9993fb722ea08fbed622d9..55ab357d75f80da57ac8d6c877f3cf2d6430a547 100644
--- a/audio/test/unittest/hdi/client_advance/render/BUILD.gn
+++ b/audio/test/unittest/hdi/client_advance/render/BUILD.gn
@@ -15,7 +15,6 @@ hdf_audio_path = "./../../../../.."
 hdf_audio_test_path = "./.."
 
 import("//build/test.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 import("$hdf_audio_path/audio.gni")
 
 ohos_unittest("hdf_audio_proxy_render_advance_test") {
diff --git a/audio/test/unittest/hdi/jack/BUILD.gn b/audio/test/unittest/hdi/jack/BUILD.gn
index 3418ea8f841846f8e0afb5e8da3421d7b4fb39c1..946cdffd050b014d2dcbb64012b04e1f4c481c50 100644
--- a/audio/test/unittest/hdi/jack/BUILD.gn
+++ b/audio/test/unittest/hdi/jack/BUILD.gn
@@ -21,7 +21,6 @@ if (defined(ohos_lite)) {
 } else {
   import("//build/ohos.gni")
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
   import("$hdf_audio_path/audio.gni")
 }
 
@@ -78,10 +77,8 @@ if (defined(ohos_lite)) {
       "$hdf_audio_test_path/input/hal:hdi_input",
       "//drivers/hdf_core/adapter/build/test_common:libhdf_test_common",
     ]
-    if (!drivers_peripheral_audio_user_mode) {
+    if (!drivers_peripheral_audio_feature_user_mode) {
       deps += [ "$hdf_audio_path/hal/hdi_passthrough:hdi_audio" ]
-    } else {
-      deps += [ "//device/soc/${product_company}/common/hal/media:hdi_audio" ]
     }
 
     if (is_standard_system) {
diff --git a/audio/test/unittest/hdi/passthrough/BUILD.gn b/audio/test/unittest/hdi/passthrough/BUILD.gn
index 03565b3f06387e0345ac7b56ca6af9907059eae8..d0688f74fe91ba7bf94df7b5d56ca62b3fac5f6f 100644
--- a/audio/test/unittest/hdi/passthrough/BUILD.gn
+++ b/audio/test/unittest/hdi/passthrough/BUILD.gn
@@ -16,7 +16,6 @@ if (defined(ohos_lite)) {
   import("./../../../../audio.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
   import("./../../../../audio.gni")
 }
 
diff --git a/audio/test/unittest/hdi/passthrough/adapter/BUILD.gn b/audio/test/unittest/hdi/passthrough/adapter/BUILD.gn
index 395554c974a7e4a1e63df78b9273f4c418a0e09d..9da86bb1008c103942aa911d4fef7613bd9eb046 100644
--- a/audio/test/unittest/hdi/passthrough/adapter/BUILD.gn
+++ b/audio/test/unittest/hdi/passthrough/adapter/BUILD.gn
@@ -19,7 +19,6 @@ if (defined(ohos_lite)) {
   import("$hdf_audio_path/audio.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
   import("$hdf_audio_path/audio.gni")
 }
 
@@ -73,14 +72,12 @@ if (defined(ohos_lite)) {
       "//third_party/googletest:gmock_main",
       "//third_party/googletest:gtest_main",
     ]
-    if (!drivers_peripheral_audio_user_mode) {
+    if (!drivers_peripheral_audio_feature_user_mode) {
       deps += [ "$hdf_audio_path/hal/hdi_passthrough:hdi_audio" ]
       external_deps = [
         "c_utils:utils",
         "hdf_core:libhdf_utils",
       ]
-    } else {
-      deps += [ "//device/soc/${product_company}/common/hal/media:hdi_audio" ]
     }
   }
 }
diff --git a/audio/test/unittest/hdi/passthrough/capture/BUILD.gn b/audio/test/unittest/hdi/passthrough/capture/BUILD.gn
index ed655d53c8a04365ec7cd190b7babc6f9068d07d..508d2df1d38d952b126bff235ef7cfe5ff81d7e1 100644
--- a/audio/test/unittest/hdi/passthrough/capture/BUILD.gn
+++ b/audio/test/unittest/hdi/passthrough/capture/BUILD.gn
@@ -19,7 +19,6 @@ if (defined(ohos_lite)) {
   import("$hdf_audio_path/audio.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
   import("$hdf_audio_path/audio.gni")
 }
 
@@ -74,18 +73,16 @@ if (defined(ohos_lite)) {
       "//third_party/googletest:gtest_main",
     ]
 
-    if (drivers_peripheral_audio_alsa_lib) {
+    if (drivers_peripheral_audio_feature_alsa_lib) {
       defines = [ "ALSA_LIB_MODE" ]
     }
 
-    if (!drivers_peripheral_audio_user_mode) {
+    if (!drivers_peripheral_audio_feature_user_mode) {
       deps += [ "$hdf_audio_path/hal/hdi_passthrough:hdi_audio" ]
       external_deps = [
         "c_utils:utils",
         "hdf_core:libhdf_utils",
       ]
-    } else {
-      deps += [ "//device/soc/${product_company}/common/hal/media:hdi_audio" ]
     }
   }
 }
diff --git a/audio/test/unittest/hdi/passthrough/manager/BUILD.gn b/audio/test/unittest/hdi/passthrough/manager/BUILD.gn
index 743cf21a4976bad9187f46f26ca215c834172d79..34d5993ecc30eba470d1d093af30950eb1c14e5d 100644
--- a/audio/test/unittest/hdi/passthrough/manager/BUILD.gn
+++ b/audio/test/unittest/hdi/passthrough/manager/BUILD.gn
@@ -18,7 +18,6 @@ if (defined(ohos_lite)) {
   import("$hdf_audio_path/audio.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
   import("$hdf_audio_path/audio.gni")
 }
 
@@ -64,14 +63,12 @@ if (defined(ohos_lite)) {
       "//third_party/googletest:gmock_main",
       "//third_party/googletest:gtest_main",
     ]
-    if (!drivers_peripheral_audio_user_mode) {
+    if (!drivers_peripheral_audio_feature_user_mode) {
       deps += [ "$hdf_audio_path/hal/hdi_passthrough:hdi_audio" ]
       external_deps = [
         "c_utils:utils",
         "hdf_core:libhdf_utils",
       ]
-    } else {
-      deps += [ "//device/soc/${product_company}/common/hal/media:hdi_audio" ]
     }
   }
 }
diff --git a/audio/test/unittest/hdi/passthrough/render/BUILD.gn b/audio/test/unittest/hdi/passthrough/render/BUILD.gn
index 897aa9fa1a7554c93e988ae69b3b9da96b854261..5c3123290104af4c79c69692e20efb95b4a051a9 100644
--- a/audio/test/unittest/hdi/passthrough/render/BUILD.gn
+++ b/audio/test/unittest/hdi/passthrough/render/BUILD.gn
@@ -19,7 +19,6 @@ if (defined(ohos_lite)) {
   import("$hdf_audio_path/audio.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
   import("$hdf_audio_path/audio.gni")
 }
 
@@ -74,18 +73,16 @@ if (defined(ohos_lite)) {
       "//third_party/googletest:gtest_main",
     ]
 
-    if (drivers_peripheral_audio_alsa_lib) {
+    if (drivers_peripheral_audio_feature_alsa_lib) {
       defines = [ "ALSA_LIB_MODE" ]
     }
 
-    if (!drivers_peripheral_audio_user_mode) {
+    if (!drivers_peripheral_audio_feature_user_mode) {
       deps += [ "$hdf_audio_path/hal/hdi_passthrough:hdi_audio" ]
       external_deps = [
         "c_utils:utils",
         "hdf_core:libhdf_utils",
       ]
-    } else {
-      deps += [ "//device/soc/${product_company}/common/hal/media:hdi_audio" ]
     }
   }
 }
diff --git a/audio/test/unittest/supportlibs/BUILD.gn b/audio/test/unittest/supportlibs/BUILD.gn
index eed296bb5b12eb50a832ff0375c15f36afc6d752..9e67fa46af65e511873a37f4c9913618395c52ca 100644
--- a/audio/test/unittest/supportlibs/BUILD.gn
+++ b/audio/test/unittest/supportlibs/BUILD.gn
@@ -16,7 +16,6 @@ if (defined(ohos_lite)) {
   import("./../../../audio.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
   import("./../../../audio.gni")
 }
 
diff --git a/audio/test/unittest/supportlibs/interface_lib_capture/BUILD.gn b/audio/test/unittest/supportlibs/interface_lib_capture/BUILD.gn
index cfe6ecefc6ad5d6b17df389515d47dc8f9d0faf2..f56561d16fc866b71e9b033168dfbbd85171c17a 100644
--- a/audio/test/unittest/supportlibs/interface_lib_capture/BUILD.gn
+++ b/audio/test/unittest/supportlibs/interface_lib_capture/BUILD.gn
@@ -18,7 +18,7 @@ if (defined(ohos_lite)) {
   import("$hdf_audio_path/audio.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
+
   import("$hdf_audio_path/audio.gni")
 }
 
@@ -54,7 +54,7 @@ if (defined(ohos_lite)) {
     module_out_path = module_output_path
     sources = []
     include_dirs = []
-    if (drivers_peripheral_audio_alsa_lib) {
+    if (drivers_peripheral_audio_feature_alsa_lib) {
       sources += [ "./src/audio_alsa_if_lib_capture_test.cpp" ]
       include_dirs += [
         "$hdf_audio_path/supportlibs/alsa_adapter/include",
diff --git a/audio/test/unittest/supportlibs/interface_lib_render/BUILD.gn b/audio/test/unittest/supportlibs/interface_lib_render/BUILD.gn
index 411ea1a4dd3b41ed7ad3c2bde9336bb06d7da3b8..fecfc44de33a8c108d5e68ad9a4623c19d579800 100644
--- a/audio/test/unittest/supportlibs/interface_lib_render/BUILD.gn
+++ b/audio/test/unittest/supportlibs/interface_lib_render/BUILD.gn
@@ -18,7 +18,7 @@ if (defined(ohos_lite)) {
   import("$hdf_audio_path/audio.gni")
 } else {
   import("//build/test.gni")
-  import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
+
   import("$hdf_audio_path/audio.gni")
 }
 
@@ -54,7 +54,7 @@ if (defined(ohos_lite)) {
     module_out_path = module_output_path
     sources = []
     include_dirs = []
-    if (drivers_peripheral_audio_alsa_lib) {
+    if (drivers_peripheral_audio_feature_alsa_lib) {
       sources += [ "./src/audio_alsa_if_lib_render_test.cpp" ]
       include_dirs += [
         "$hdf_audio_path/supportlibs/alsa_adapter/include",