From 79d4e15fbd91d2189ba8838c6fb44908e3e7c75f Mon Sep 17 00:00:00 2001
From: liangqi <liangqi28@huawei.com>
Date: Mon, 16 Jun 2025 20:17:54 +0800
Subject: [PATCH 1/2] fix some hdfcore error

Signed-off-by: liangqi <liangqi28@huawei.com>
---
 adapter/uhdf2/test/unittest/config/BUILD.gn  | 5 ++++-
 adapter/uhdf2/test/unittest/manager/BUILD.gn | 6 ++++--
 adapter/uhdf2/test/unittest/osal/BUILD.gn    | 2 +-
 framework/tools/hdi-gen/util/options.cpp     | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/adapter/uhdf2/test/unittest/config/BUILD.gn b/adapter/uhdf2/test/unittest/config/BUILD.gn
index 4d46ae261..0f7a43a15 100644
--- a/adapter/uhdf2/test/unittest/config/BUILD.gn
+++ b/adapter/uhdf2/test/unittest/config/BUILD.gn
@@ -21,7 +21,10 @@ ohos_unittest("hdf_adapter_uhdf_test_config") {
   module_out_path = module_output_path
   include_dirs = [ "$hdf_core_path/framework/test/unittest/include" ]
 
-  sources = [ "$hdf_core_path/framework/utils/src/hcs_parser/test/unittest/common/hdf_config_test.cpp" ]
+  sources = [ 
+    "$hdf_core_path/framework/utils/src/hcs_parser/test/unittest/common/hdf_config_test.cpp",
+    "$hdf_core_path/framework/test/unittest/common/hdf_common_test.c"
+  ]
   resource_config_file =
       "$hdf_core_path/adapter/uhdf2/test/resource/config/ohos_test.xml"
   deps = [
diff --git a/adapter/uhdf2/test/unittest/manager/BUILD.gn b/adapter/uhdf2/test/unittest/manager/BUILD.gn
index b8b9d1154..51921bafc 100644
--- a/adapter/uhdf2/test/unittest/manager/BUILD.gn
+++ b/adapter/uhdf2/test/unittest/manager/BUILD.gn
@@ -33,9 +33,11 @@ ohos_unittest("hdf_adapter_uhdf_test_manager") {
   ]
 
   defines = [ "__USER__" ]
-  sources = [ "$hdf_framework_path/core/manager/test/unittest/common/hdf_lite_manager_test.cpp" ]
+  sources = [
+    "$hdf_framework_path/core/manager/test/unittest/common/hdf_lite_manager_test.cpp",
+    "$hdf_framework_path/test/unittest/common/hdf_common_test.c"
+  ]
   deps = [
-    "$hdf_adapter_path/build/test_common:libhdf_test_common",
     "$hdf_adapter_path/uhdf2/utils:libhdf_utils",
   ]
   resource_config_file =
diff --git a/adapter/uhdf2/test/unittest/osal/BUILD.gn b/adapter/uhdf2/test/unittest/osal/BUILD.gn
index 9f3df6ea2..8e1314e32 100644
--- a/adapter/uhdf2/test/unittest/osal/BUILD.gn
+++ b/adapter/uhdf2/test/unittest/osal/BUILD.gn
@@ -36,9 +36,9 @@ ohos_unittest("hdf_adapter_uhdf_test_osal") {
   defines = [ "__USER__" ]
   sources = [
     "$hdf_framework_path/support/posix/test/unittest/common/hdf_osal_test.cpp",
+    "$hdf_framework_path/test/unittest/common/hdf_common_test.c"
   ]
   deps = [
-    "$hdf_adapter_path/build/test_common:libhdf_test_common",
     "$hdf_adapter_path/uhdf2/utils:libhdf_utils",
   ]
   resource_config_file =
diff --git a/framework/tools/hdi-gen/util/options.cpp b/framework/tools/hdi-gen/util/options.cpp
index d1479f700..cb721dbb3 100644
--- a/framework/tools/hdi-gen/util/options.cpp
+++ b/framework/tools/hdi-gen/util/options.cpp
@@ -177,7 +177,7 @@ void Options::AddSources(const std::string &sourceFile)
 
 std::string Options::CheckOutPutFile(const std::string &sourceFile)
 {
-    std::string realPath = File::AdapterRealPath(sourceFile);
+    std::string realPath = File::AdapterPath(sourceFile);
     if (realPath.empty()) {
         Logger::E(TAG, "invalid idl file path:%s", sourceFile.c_str());
         return "";
-- 
Gitee


From 8df5d4bbafac8ff1a2661767447703b5e671a57b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6?= <liangqi28@huawei.com>
Date: Mon, 16 Jun 2025 12:39:51 +0000
Subject: [PATCH 2/2] update adapter/uhdf2/test/unittest/config/BUILD.gn.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 梁琦 <liangqi28@huawei.com>
---
 adapter/uhdf2/test/unittest/config/BUILD.gn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/adapter/uhdf2/test/unittest/config/BUILD.gn b/adapter/uhdf2/test/unittest/config/BUILD.gn
index 0f7a43a15..886e5daad 100644
--- a/adapter/uhdf2/test/unittest/config/BUILD.gn
+++ b/adapter/uhdf2/test/unittest/config/BUILD.gn
@@ -28,7 +28,6 @@ ohos_unittest("hdf_adapter_uhdf_test_config") {
   resource_config_file =
       "$hdf_core_path/adapter/uhdf2/test/resource/config/ohos_test.xml"
   deps = [
-    "$hdf_core_path/adapter/build/test_common:libhdf_test_common",
     "$hdf_uhdf_path/utils:libhdf_utils",
   ]
   if (is_standard_system) {
-- 
Gitee