From 4102726ebb1fd97d70d6ff70482647e8f13bc827 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Thu, 22 Aug 2024 01:36:14 +0000 Subject: [PATCH 1/5] =?UTF-8?q?frameworks/BUILD.gn=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E5=A4=96=E9=83=A8=E4=BE=9D=E8=B5=96bundle=5Fframework:libappex?= =?UTF-8?q?ecfwk=5Fcommon=E5=92=8Cbundle=5Fframework:bundle=5Fnapi=5Fcommo?= =?UTF-8?q?n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- frameworks/BUILD.gn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frameworks/BUILD.gn b/frameworks/BUILD.gn index 5440450..e4d5693 100644 --- a/frameworks/BUILD.gn +++ b/frameworks/BUILD.gn @@ -28,8 +28,6 @@ config("tools_bm_config") { ohos_source_set("tools_bm_source_set") { sources = [ - "${common_path}/log/src/app_log_wrapper.cpp", - "${kits_path}/js/bundlemgr/bundle_death_recipient.cpp", "src/bundle_command.cpp", "src/bundle_command_common.cpp", "src/main.cpp", @@ -52,6 +50,8 @@ ohos_source_set("tools_bm_source_set") { "ability_runtime:quickfix_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "bundle_framework:libappexecfwk_common", + "bundle_framework:bundle_napi_common", "c_utils:utils", "common_event_service:cesfwk_innerkits", "hilog:libhilog", @@ -94,8 +94,6 @@ ohos_executable("bm") { ohos_source_set("tools_test_bm_source_set") { sources = [ - "${common_path}/log/src/app_log_wrapper.cpp", - "${kits_path}/js/bundlemgr/bundle_death_recipient.cpp", "src/bundle_command_common.cpp", "src/bundle_test_tool.cpp", "src/bundle_tool_callback/bundle_tool_callback_stub.cpp", @@ -119,6 +117,8 @@ ohos_source_set("tools_test_bm_source_set") { "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "bundle_framework:libappexecfwk_common", + "bundle_framework:bundle_napi_common", "c_utils:utils", "common_event_service:cesfwk_innerkits", "hilog:libhilog", -- Gitee From ac82012c3a03355e674854f84cb7f1e250379c33 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Thu, 22 Aug 2024 02:06:03 +0000 Subject: [PATCH 2/5] frameworks/BUILD.gn add deps bundle_framework:bundle Signed-off-by: tongkai0808fh --- frameworks/BUILD.gn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frameworks/BUILD.gn b/frameworks/BUILD.gn index e4d5693..e92a84a 100644 --- a/frameworks/BUILD.gn +++ b/frameworks/BUILD.gn @@ -52,6 +52,7 @@ ohos_source_set("tools_bm_source_set") { "bundle_framework:appexecfwk_core", "bundle_framework:libappexecfwk_common", "bundle_framework:bundle_napi_common", + "bundle_framework:bundle", "c_utils:utils", "common_event_service:cesfwk_innerkits", "hilog:libhilog", @@ -119,6 +120,7 @@ ohos_source_set("tools_test_bm_source_set") { "bundle_framework:appexecfwk_core", "bundle_framework:libappexecfwk_common", "bundle_framework:bundle_napi_common", + "bundle_framework:bundle", "c_utils:utils", "common_event_service:cesfwk_innerkits", "hilog:libhilog", -- Gitee From 3f588c4a372e73b7d419c7c8cff6675b5d67d71a Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Thu, 22 Aug 2024 10:23:14 +0800 Subject: [PATCH 3/5] framework gn file format Signed-off-by: tongkai0808fh --- frameworks/BUILD.gn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frameworks/BUILD.gn b/frameworks/BUILD.gn index e92a84a..f6f7b59 100644 --- a/frameworks/BUILD.gn +++ b/frameworks/BUILD.gn @@ -50,9 +50,9 @@ ohos_source_set("tools_bm_source_set") { "ability_runtime:quickfix_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", - "bundle_framework:libappexecfwk_common", - "bundle_framework:bundle_napi_common", "bundle_framework:bundle", + "bundle_framework:bundle_napi_common", + "bundle_framework:libappexecfwk_common", "c_utils:utils", "common_event_service:cesfwk_innerkits", "hilog:libhilog", @@ -118,9 +118,9 @@ ohos_source_set("tools_test_bm_source_set") { "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", - "bundle_framework:libappexecfwk_common", - "bundle_framework:bundle_napi_common", "bundle_framework:bundle", + "bundle_framework:bundle_napi_common", + "bundle_framework:libappexecfwk_common", "c_utils:utils", "common_event_service:cesfwk_innerkits", "hilog:libhilog", -- Gitee From df3373de514a204d1c13a3de8a629abb4f2e8d0a Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Fri, 23 Aug 2024 08:53:45 +0000 Subject: [PATCH 4/5] update frameworks/BUILD.gn. Signed-off-by: tongkai0808fh --- frameworks/BUILD.gn | 2 -- 1 file changed, 2 deletions(-) diff --git a/frameworks/BUILD.gn b/frameworks/BUILD.gn index f6f7b59..31d2df2 100644 --- a/frameworks/BUILD.gn +++ b/frameworks/BUILD.gn @@ -50,7 +50,6 @@ ohos_source_set("tools_bm_source_set") { "ability_runtime:quickfix_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", - "bundle_framework:bundle", "bundle_framework:bundle_napi_common", "bundle_framework:libappexecfwk_common", "c_utils:utils", @@ -118,7 +117,6 @@ ohos_source_set("tools_test_bm_source_set") { "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", - "bundle_framework:bundle", "bundle_framework:bundle_napi_common", "bundle_framework:libappexecfwk_common", "c_utils:utils", -- Gitee From 7b36511de6f60a6a44c5fde1994085a14b266f4d Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Tue, 27 Aug 2024 02:05:49 +0000 Subject: [PATCH 5/5] =?UTF-8?q?frameworks/BUILD.gn=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E4=BE=9D=E8=B5=96bundle=5Fframework:bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- frameworks/BUILD.gn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frameworks/BUILD.gn b/frameworks/BUILD.gn index 31d2df2..f6f7b59 100644 --- a/frameworks/BUILD.gn +++ b/frameworks/BUILD.gn @@ -50,6 +50,7 @@ ohos_source_set("tools_bm_source_set") { "ability_runtime:quickfix_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "bundle_framework:bundle", "bundle_framework:bundle_napi_common", "bundle_framework:libappexecfwk_common", "c_utils:utils", @@ -117,6 +118,7 @@ ohos_source_set("tools_test_bm_source_set") { "ability_base:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "bundle_framework:bundle", "bundle_framework:bundle_napi_common", "bundle_framework:libappexecfwk_common", "c_utils:utils", -- Gitee