From d5262dacb3a7f4478dfa209426b48617136e4e98 Mon Sep 17 00:00:00 2001
From: sunjiakun <sunjiakun5@huawei.com>
Date: Sat, 21 Dec 2024 15:00:25 +0800
Subject: [PATCH] =?UTF-8?q?all=5Fdependent=5Fconfigs=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: sunjiakun <sunjiakun5@huawei.com>
---
 common/BUILD.gn                                  |  6 ++++--
 interfaces/inner_api/appexecfwk_base/BUILD.gn    | 14 ++++++++++++--
 interfaces/inner_api/appexecfwk_core/BUILD.gn    |  2 ++
 interfaces/inner_api/bundlemgr_graphics/BUILD.gn |  1 +
 services/bundlemgr/BUILD.gn                      |  5 ++++-
 5 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/common/BUILD.gn b/common/BUILD.gn
index 5af7eedc36..d0179d8401 100644
--- a/common/BUILD.gn
+++ b/common/BUILD.gn
@@ -48,8 +48,10 @@ ohos_shared_library("libappexecfwk_common") {
     }
   }
 
-  public_configs = [ ":appexecfwk_common_config" ]
-
+  public_configs = [
+    ":appexecfwk_common_config",
+    ":bundle_all_dependent_config",
+  ]
   all_dependent_configs = [ ":bundle_all_dependent_config" ]
 
   external_deps = [
diff --git a/interfaces/inner_api/appexecfwk_base/BUILD.gn b/interfaces/inner_api/appexecfwk_base/BUILD.gn
index a41066f47c..0b5c1f205f 100644
--- a/interfaces/inner_api/appexecfwk_base/BUILD.gn
+++ b/interfaces/inner_api/appexecfwk_base/BUILD.gn
@@ -35,6 +35,13 @@ config("bundle_all_dependent_config") {
   ]
 }
 
+config("bundle_base_dependent_config") {
+  include_dirs = [
+    "include",
+    "include/clone",
+  ]
+}
+
 ohos_shared_library("appexecfwk_base") {
   branch_protector_ret = "pac_ret"
   sources = [
@@ -91,8 +98,10 @@ ohos_shared_library("appexecfwk_base") {
     "src/skill.cpp",
   ]
 
-  public_configs = [ ":appexecfwk_base_sdk_config" ]
-
+  public_configs = [
+    ":appexecfwk_base_sdk_config",
+    ":bundle_base_dependent_config",
+  ]
   all_dependent_configs = [ ":bundle_all_dependent_config" ]
 
   defines = [
@@ -128,6 +137,7 @@ ohos_shared_library("appexecfwk_base") {
   public_external_deps = [
     "ability_base:base",
     "ability_base:want",
+    "common_event_service:cesfwk_innerkits",
     "json:nlohmann_json_static",
   ]
 
diff --git a/interfaces/inner_api/appexecfwk_core/BUILD.gn b/interfaces/inner_api/appexecfwk_core/BUILD.gn
index e08b7e6ae5..b88aec83a2 100644
--- a/interfaces/inner_api/appexecfwk_core/BUILD.gn
+++ b/interfaces/inner_api/appexecfwk_core/BUILD.gn
@@ -64,6 +64,7 @@ ohos_shared_library("appexecfwk_core") {
   public_configs = [
     ":appexecfwk_core_config",
     ":bundlemgr_sdk_config",
+    "${base_path}:bundle_base_dependent_config",
   ]
 
   defines = [
@@ -167,6 +168,7 @@ ohos_shared_library("bundlemgr_mini") {
   public_configs = [
     ":appexecfwk_core_config",
     ":bundlemgr_sdk_config",
+    "${base_path}:bundle_base_dependent_config",
   ]
 
   defines = [
diff --git a/interfaces/inner_api/bundlemgr_graphics/BUILD.gn b/interfaces/inner_api/bundlemgr_graphics/BUILD.gn
index 64c132e9d6..5290645ad8 100644
--- a/interfaces/inner_api/bundlemgr_graphics/BUILD.gn
+++ b/interfaces/inner_api/bundlemgr_graphics/BUILD.gn
@@ -36,6 +36,7 @@ ohos_shared_library("bundlemgr_graphics") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
   }
   deps = [
+    "${base_path}:appexecfwk_base",
     "${common_path}:libappexecfwk_common",
     "${core_path}:appexecfwk_core",
   ]
diff --git a/services/bundlemgr/BUILD.gn b/services/bundlemgr/BUILD.gn
index dd364ad491..90e0b64473 100644
--- a/services/bundlemgr/BUILD.gn
+++ b/services/bundlemgr/BUILD.gn
@@ -610,7 +610,10 @@ ohos_shared_library("bundle_tool_libs") {
 
   sources = [ "${kits_path}/js/bundlemgr/bundle_death_recipient.cpp" ]
 
-  deps = [ "${core_path}:appexecfwk_core" ]
+  deps = [
+    "${common_path}:libappexecfwk_common",
+    "${core_path}:appexecfwk_core",
+  ]
 
   external_deps = [
     "c_utils:utils",
-- 
Gitee