From 4db37cdd64e6b4721bcda0ec67a6ada2f08abb35 Mon Sep 17 00:00:00 2001
From: chen <chenpan0560>
Date: Wed, 10 May 2023 17:08:33 +0800
Subject: [PATCH] fix:File decoupling of build.gn about liteos_m Cored

Signed-off-by: chenpan0560 <chenpan55@huawei.com>
---
 adapter/khdf/liteos_m/BUILD.gn      |  8 +++---
 adapter/khdf/liteos_m/core/BUILD.gn | 41 +++++++++--------------------
 2 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/adapter/khdf/liteos_m/BUILD.gn b/adapter/khdf/liteos_m/BUILD.gn
index 375075fe1..dd70f38b3 100644
--- a/adapter/khdf/liteos_m/BUILD.gn
+++ b/adapter/khdf/liteos_m/BUILD.gn
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021, Huawei Device Co., Ltd. All rights reserved.
+# Copyright (c) 2021-2023, Huawei Device Co., Ltd. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
 # are permitted provided that the following conditions are met:
@@ -34,7 +34,6 @@ HDF_INTERFACES_PATH = "../../../interfaces"
 
 hdf_driver("hdf_lite") {
   deps = [
-    "core",
     "model",
     "network",
     "osal",
@@ -42,7 +41,10 @@ hdf_driver("hdf_lite") {
     "test",
   ]
   if (!defined(LOSCFG_DRIVERS_HDF_CONFIG_MACRO)) {
-    deps += [ HDF_ADAPTER_PLATFORM_PATH ]
+    deps += [
+      "core",
+      HDF_ADAPTER_PLATFORM_PATH,
+    ]
   }
 }
 
diff --git a/adapter/khdf/liteos_m/core/BUILD.gn b/adapter/khdf/liteos_m/core/BUILD.gn
index 6860ca2bf..72d493753 100644
--- a/adapter/khdf/liteos_m/core/BUILD.gn
+++ b/adapter/khdf/liteos_m/core/BUILD.gn
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021, Huawei Device Co., Ltd. All rights reserved.
+# Copyright (c) 2021-2023, Huawei Device Co., Ltd. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
 # are permitted provided that the following conditions are met:
@@ -65,32 +65,15 @@ hdf_driver("hdf_core") {
     "common/src/devsmall_object_config.c",
     "common/src/hdf_device_node_ext.c",
   ]
-  if (defined(LOSCFG_DRIVERS_HDF_CONFIG_MACRO)) {
-    sources += [ "$HDF_FRAMEWORKS_PATH/core/common/src/hdf_attribute_macro.c" ]
-  } else {
-    sources += [
-      "$HDF_FRAMEWORKS_PATH/core/common/src/buildin_config_entry.c",
-      "$HDF_FRAMEWORKS_PATH/core/common/src/hdf_attribute.c",
-      "$HDF_FRAMEWORKS_PATH/utils/src/hcs_parser/device_resource_if.c",
-      "$HDF_FRAMEWORKS_PATH/utils/src/hcs_parser/hcs_blob_if.c",
-      "$HDF_FRAMEWORKS_PATH/utils/src/hcs_parser/hcs_buildin_parser.c",
-      "$HDF_FRAMEWORKS_PATH/utils/src/hcs_parser/hcs_generate_tree.c",
-      "$HDF_FRAMEWORKS_PATH/utils/src/hcs_parser/hcs_parser.c",
-      "$HDF_FRAMEWORKS_PATH/utils/src/hcs_parser/hcs_tree_if.c",
-    ]
-  }
-  if (defined(LOSCFG_SHIELD_V200ZR_EVB_T1) &&
-      defined(LOSCFG_DRIVERS_HDF_CONFIG_MACRO)) {
-    deps = [ "//device/board/fnlink/shields" ]
-  }
-  if (defined(LOSCFG_DRIVERS_HDF_CONFIG_MACRO)) {
-    HDF_HCS_BUILD_PATH = rebase_path(
-            "//device/board/$device_company/$device_name/liteos_m/hdf_config")
-    cmd = "if [ -f ${HDF_HCS_BUILD_PATH}/BUILD.gn ]; then echo true; else echo false; fi"
-    HAVE_HCS_BUILD_PATH =
-        exec_script("//build/lite/run_shell_cmd.py", [ cmd ], "value")
-    if (HAVE_HCS_BUILD_PATH) {
-      deps = [ "${HDF_HCS_BUILD_PATH}" ]
-    }
-  }
+
+  sources += [
+    "$HDF_FRAMEWORKS_PATH/core/common/src/buildin_config_entry.c",
+    "$HDF_FRAMEWORKS_PATH/core/common/src/hdf_attribute.c",
+    "$HDF_FRAMEWORKS_PATH/utils/src/hcs_parser/device_resource_if.c",
+    "$HDF_FRAMEWORKS_PATH/utils/src/hcs_parser/hcs_blob_if.c",
+    "$HDF_FRAMEWORKS_PATH/utils/src/hcs_parser/hcs_buildin_parser.c",
+    "$HDF_FRAMEWORKS_PATH/utils/src/hcs_parser/hcs_generate_tree.c",
+    "$HDF_FRAMEWORKS_PATH/utils/src/hcs_parser/hcs_parser.c",
+    "$HDF_FRAMEWORKS_PATH/utils/src/hcs_parser/hcs_tree_if.c",
+  ]
 }
-- 
Gitee