From ff2df6ff038a5fca7ea1fecdf1afbf8ab8a9e7a8 Mon Sep 17 00:00:00 2001 From: edwardcaoyue Date: Wed, 14 Jun 2023 15:23:42 +0800 Subject: [PATCH] add compile patch Signed-off-by: edwardcaoyue --- RELEASE-NOTES.md | 2 +- bundle.json | 16 ++++++++++------ patches/patches.json | 9 +++++++++ patches/rich.patch | 15 +++++++++++++++ services/BUILD.gn | 4 +--- 5 files changed, 36 insertions(+), 10 deletions(-) create mode 100644 patches/patches.json create mode 100644 patches/rich.patch diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 80de028..e35a259 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,4 +1,4 @@ # RELEASE-NOTES # 1.0.0 -1. Initial version \ No newline at end of file +1. Initial version diff --git a/bundle.json b/bundle.json index db26336..5f91db1 100644 --- a/bundle.json +++ b/bundle.json @@ -25,14 +25,18 @@ "components": [ "ability_base", "ability_runtime", - "libeventhandler", - "ipc_single", - "samgr", - "system_ability_fwk" + "c_utils", + "eventhandler", + "frame_aware_sched", + "hitrace_native", + "hiviewdfx_hilog_native", + "ipc", + "safwk", + "samgr" ], "third_party": [ - "xml2", - "json" + "json", + "jsoncpp" ] }, "build": { diff --git a/patches/patches.json b/patches/patches.json new file mode 100644 index 0000000..3764e61 --- /dev/null +++ b/patches/patches.json @@ -0,0 +1,9 @@ +{ + "patches": [ + { + "project":"productdefine_common", + "patch_file":"rich.patch", + "path":"productdefine/common" + } + ] +} \ No newline at end of file diff --git a/patches/rich.patch b/patches/rich.patch new file mode 100644 index 0000000..e733aae --- /dev/null +++ b/patches/rich.patch @@ -0,0 +1,15 @@ +diff --git a/inherit/rich.json b/inherit/rich.json +index 324d061..bfc9604 100644 +--- a/inherit/rich.json ++++ b/inherit/rich.json +@@ -872,6 +872,10 @@ + "component": "frame_aware_sched", + "features": [] + }, ++ { ++ "component": "qos_manager", ++ "features": [] ++ }, + { + "component": "device_usage_statistics", + "features": [] diff --git a/services/BUILD.gn b/services/BUILD.gn index e700966..0ea6add 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -24,7 +24,6 @@ config("concurrent_task_config") { "//foundation/resourceschedule/frame_aware_sched/common/include/", "//utils/system/safwk/native/include", "//commonlibrary/c_utils/base/include", - "//third_party/libxml2/include", "//third_party/jsoncpp/include", ] } @@ -45,14 +44,13 @@ ohos_shared_library("concurrentsvc") { ] deps = [ - "//foundation/resourceschedule/frame_aware_sched/interfaces/innerkits/frameintf:rtg_interface", "//third_party/jsoncpp:jsoncpp", - "//third_party/libxml2:xml2", ] external_deps = [ "c_utils:utils", "eventhandler:libeventhandler", + "frame_aware_sched:rtg_interface", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_single", "safwk:system_ability_fwk",