From da5c4c5720ad73cc84470ff6a506985b98b866f6 Mon Sep 17 00:00:00 2001 From: mengyiping <1091773127@qq.com> Date: Tue, 2 Apr 2024 14:18:07 +0800 Subject: [PATCH 1/5] bugfix Signed-off-by: mengyiping <1091773127@qq.com> --- bundle.json | 10 +++++----- interfaces/innerkits/frameintf/BUILD.gn | 15 ++++++--------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/bundle.json b/bundle.json index 4888670..dfb82c2 100644 --- a/bundle.json +++ b/bundle.json @@ -14,22 +14,22 @@ "subsystem": "resourceschedule", "syscap": [], "features": [], - "adapted_system_type": ["standard"], + "adapted_system_type": [ + "standard" + ], "rom": "2048KB", "ram": "10240KB", "deps": { "components": [ + "bounds_checking_function", "c_utils", "eventhandler", "ffrt", "hitrace", "hilog", + "libxml2", "samgr", "safwk" - ], - "third_party": [ - "bounds_checking_function", - "libxml2" ] }, "build": { diff --git a/interfaces/innerkits/frameintf/BUILD.gn b/interfaces/innerkits/frameintf/BUILD.gn index 4aeec2c..be96df0 100644 --- a/interfaces/innerkits/frameintf/BUILD.gn +++ b/interfaces/innerkits/frameintf/BUILD.gn @@ -127,14 +127,13 @@ ohos_shared_library("frame_msg_intf") { public_configs = [ ":frame_msg_intf_config" ] - deps = [ "//third_party/libxml2:libxml2" ] - external_deps = [ "c_utils:utils", "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", "hitrace:hitrace_meter", + "libxml2:libxml2" ] subsystem_name = "resourceschedule" @@ -158,14 +157,12 @@ ohos_shared_library("rtg_interface") { public_configs = [ ":rtg_interface_config" ] - include_dirs = [ - "../../../common/include", - "//third_party/bounds_checking_function/include", - ] - - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] + include_dirs = [ "../../../common/include" ] - external_deps = [ "hilog:libhilog" ] + external_deps = [ + "bounds_checking_function:libsec_shared", + "hilog:libhilog", + ] install_enable = true subsystem_name = "resourceschedule" -- Gitee From 6c29f32f88f491e2c2661e9249c32ba96553fec1 Mon Sep 17 00:00:00 2001 From: mengyiping <1091773127@qq.com> Date: Tue, 2 Apr 2024 14:24:43 +0800 Subject: [PATCH 2/5] --amend Signed-off-by: mengyiping <1091773127@qq.com> --- bundle.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/bundle.json b/bundle.json index dfb82c2..0dcf1c6 100644 --- a/bundle.json +++ b/bundle.json @@ -14,9 +14,7 @@ "subsystem": "resourceschedule", "syscap": [], "features": [], - "adapted_system_type": [ - "standard" - ], + "adapted_system_type": [ "standard" ], "rom": "2048KB", "ram": "10240KB", "deps": { @@ -30,7 +28,7 @@ "libxml2", "samgr", "safwk" - ] + ], }, "build": { "sub_component": [ @@ -83,4 +81,4 @@ ] } } -} \ No newline at end of file +} -- Gitee From b658d23cacc049287aeff9204429bebb82f8c83c Mon Sep 17 00:00:00 2001 From: mengyiping <1091773127@qq.com> Date: Tue, 2 Apr 2024 14:28:52 +0800 Subject: [PATCH 3/5] --amend Signed-off-by: mengyiping <1091773127@qq.com> --- bundle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index 0dcf1c6..45f2ddf 100644 --- a/bundle.json +++ b/bundle.json @@ -28,7 +28,7 @@ "libxml2", "samgr", "safwk" - ], + ] }, "build": { "sub_component": [ -- Gitee From ddb0d1a6ed6044ce8057bcc63d1062055ebda17b Mon Sep 17 00:00:00 2001 From: mengyiping <1091773127@qq.com> Date: Tue, 2 Apr 2024 14:31:58 +0800 Subject: [PATCH 4/5] --amend Signed-off-by: mengyiping <1091773127@qq.com> --- bundle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index 45f2ddf..06116c4 100644 --- a/bundle.json +++ b/bundle.json @@ -14,7 +14,7 @@ "subsystem": "resourceschedule", "syscap": [], "features": [], - "adapted_system_type": [ "standard" ], + "adapted_system_type": ["standard"], "rom": "2048KB", "ram": "10240KB", "deps": { -- Gitee From 96be7a7551a6c082f1440007b867a1d30710c880 Mon Sep 17 00:00:00 2001 From: mengyiping <1091773127@qq.com> Date: Tue, 2 Apr 2024 14:54:24 +0800 Subject: [PATCH 5/5] --amend Signed-off-by: mengyiping <1091773127@qq.com> --- interfaces/innerkits/frameintf/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/frameintf/BUILD.gn b/interfaces/innerkits/frameintf/BUILD.gn index be96df0..4fab553 100644 --- a/interfaces/innerkits/frameintf/BUILD.gn +++ b/interfaces/innerkits/frameintf/BUILD.gn @@ -133,7 +133,7 @@ ohos_shared_library("frame_msg_intf") { "ffrt:libffrt", "hilog:libhilog", "hitrace:hitrace_meter", - "libxml2:libxml2" + "libxml2:libxml2", ] subsystem_name = "resourceschedule" -- Gitee