From 49f3361ce79f58d2f640030279536e36a60b8752 Mon Sep 17 00:00:00 2001 From: rongkunshi Date: Mon, 21 Feb 2022 15:29:04 +0800 Subject: [PATCH] change-code-for-compile-and gn-format Signed-off-by: rongkunshi --- BUILD.gn | 10 +- bundle.json | 20 +-- frameaware.gni | 2 +- interfaces/innerkits/BUILD.gn | 10 +- interfaces/innerkits/frameintf/BUILD.gn | 172 +++++++++++------------- test/BUILD.gn | 96 +++++++------ 6 files changed, 147 insertions(+), 163 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index bed0e84..8cbe837 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -14,11 +14,9 @@ import("//build/ohos.gni") import("//foundation/resourceschedule/frame_aware_sched/frameaware.gni") - group("libintellisensesched_intf") { - public_deps = [ - "${innerkits_path}/frameintf:frame_msg_intf"， - "${innerkits_path}/frameintf:frame_ui_intf"， - ] + public_deps = [ + "${innerkits_path}/frameintf:frame_msg_intf", + "${innerkits_path}/frameintf:frame_ui_intf", + ] } - diff --git a/bundle.json b/bundle.json index a51bb73..2d5ce4f 100644 --- a/bundle.json +++ b/bundle.json @@ -5,7 +5,7 @@ "license": "Apache License 2.0", "publishAs": "code-segment", "segment": { - "destPath": "foundation/resourceschedule/plugins/frame_aware_sched" + "destPath": "foundation/resourceschedule/frame_aware_sched" }, "dirs": {}, "scripts": {}, @@ -34,33 +34,33 @@ }, "build": { "sub_component": [ - "//foundation/resourceschedule/plugins/frame_aware_sched/interfaces/innerkits/frameintf:frame_ui_intf", - "//foundation/resourceschedule/plugins/frame_aware_sched/interfaces/innerkits/frameintf:frame_msg_intf", - "//foundation/resourceschedule/plugins/frame_aware_sched/interfaces/innerkits/frameintf:rtg_interface", - "//foundation/resourceschedule/plugins/frame_aware_sched/profiles:frame_aware_sched_config" + "//foundation/resourceschedule/frame_aware_sched/interfaces/innerkits/frameintf:frame_ui_intf", + "//foundation/resourceschedule/frame_aware_sched/interfaces/innerkits/frameintf:frame_msg_intf", + "//foundation/resourceschedule/frame_aware_sched/interfaces/innerkits/frameintf:rtg_interface", + "//foundation/resourceschedule/frame_aware_sched/profiles:frame_aware_sched_config" ], "inner_kits": [ { "header": { - "header_base": "//foundation/resourceschedule/plugins/frame_aware_sched/interfaces/innerkits/frameintf", + "header_base": "//foundation/resourceschedule/frame_aware_sched/interfaces/innerkits/frameintf", "header_files": [ "frame_ui_intf.h" ] }, - "name": "//foundation/resourceschedule/plugins/frame_aware_sched/interfaces/innerkits/frameintf:frame_ui_intf" + "name": "//foundation/resourceschedule/frame_aware_sched/interfaces/innerkits/frameintf:frame_ui_intf" }, { "header": { - "header_base": "//foundation/resourceschedule/plugins/frame_aware_sched/interfaces/innerkits/frameintf", + "header_base": "//foundation/resourceschedule/frame_aware_sched/interfaces/innerkits/frameintf", "header_files": [ "frame_msg_intf.h" ] }, - "name": "//foundation/resourceschedule/plugins/frame_aware_sched/interfaces/innerkits/frameintf:frame_msg_intf" + "name": "//foundation/resourceschedule/frame_aware_sched/interfaces/innerkits/frameintf:frame_msg_intf" } ], "test": [ - "//foundation/resourceschedule/plugins/frame_aware_sched/test:frame_unittest" + "//foundation/resourceschedule/frame_aware_sched/test:frame_unittest" ] } } diff --git a/frameaware.gni b/frameaware.gni index b4eba46..dfb2a18 100644 --- a/frameaware.gni +++ b/frameaware.gni @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -frame_aware_path = "//foundation/resourceschedule/plugins/frame_aware_sched" +frame_aware_path = "//foundation/resourceschedule/frame_aware_sched" service_path = "${frame_aware_path}/services" innerkits_path = "${frame_aware_path}/interfaces/innerkits" diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index 329c869..f7a74b0 100644 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -15,9 +15,9 @@ import("//build/ohos.gni") import("//foundation/resourceschedule/frame_aware_sched/frame_aware_sched.gni") group("innerkits_target") { - deps = [ - "frameintf:frame_ui_intf", - "frameintf:frame_msg_intf", - "frameintf:rtg_interface", - ] + deps = [ + "frameintf:frame_msg_intf", + "frameintf:frame_ui_intf", + "frameintf:rtg_interface", + ] } diff --git a/interfaces/innerkits/frameintf/BUILD.gn b/interfaces/innerkits/frameintf/BUILD.gn index 1882f27..2d4d191 100644 --- a/interfaces/innerkits/frameintf/BUILD.gn +++ b/interfaces/innerkits/frameintf/BUILD.gn @@ -12,112 +12,102 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/resourceschedule/plugins/frame_aware_sched/frameaware.gni") - +import("//foundation/resourceschedule/frame_aware_sched/frameaware.gni") config("frame_ui_intf_config") { - visibility = [ ":*" ] - - include_dirs = [ - "${innerkits_path}/frameintf", - "${frame_aware_path}/common/include", - "${framework_path}/frame_aware_collector/include", - "//utils/native/base/include", - "//utils/system/safwk/native/include", - "//base/hiviewdfx/interfaces/innerkits/libhilog/include", - "//base/hiviewdfx/interfaces/innerkits/libhitrace/include", - ] + visibility = [ ":*" ] + + include_dirs = [ + "${innerkits_path}/frameintf", + "${frame_aware_path}/common/include", + "${framework_path}/frame_aware_collector/include", + "//utils/native/base/include", + "//utils/system/safwk/native/include", + "//base/hiviewdfx/interfaces/innerkits/libhilog/include", + "//base/hiviewdfx/interfaces/innerkits/libhitrace/include", + ] } ohos_shared_library("frame_ui_intf") { - sources = [ - "frame_ui_intf.cpp", - "${framework_path}/frame_aware_collector/src/frame_msg_mgr.cpp", - "${framework_path}/frame_aware_collector/src/frame_window_mgr.cpp", - "${framework_path}/frame_aware_collector/src/rme_core_sched.cpp", - "${framework_path}/frame_aware_collector/src/rme_scene_sched.cpp", - "${frame_aware_path}/interfaces/innerkits/frameintf/rtg_interface.cpp", - ] - - configs = [ ":frame_ui_intf_config" ] - - deps = [ - "//utils/native/base:utils", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - ] - - public_deps = [ - "//utils/native/base:utils", - ] - - external_deps = [ - "hiviewdfx_hilog_native:libhilog", - "bytrace_standard:bytrace_core", - "dsoftbus_standard:softbus_client", - "ipc:ipc_core", - ] - - subsystem_name = "resourceschedule" - part_name = "frame_aware_sched" + sources = [ + "${frame_aware_path}/interfaces/innerkits/frameintf/rtg_interface.cpp", + "${framework_path}/frame_aware_collector/src/frame_msg_mgr.cpp", + "${framework_path}/frame_aware_collector/src/frame_window_mgr.cpp", + "${framework_path}/frame_aware_collector/src/rme_core_sched.cpp", + "${framework_path}/frame_aware_collector/src/rme_scene_sched.cpp", + "frame_ui_intf.cpp", + ] + + configs = [ ":frame_ui_intf_config" ] + + deps = [ + "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//utils/native/base:utils", + ] + + public_deps = [ "//utils/native/base:utils" ] + + external_deps = [ + "bytrace_standard:bytrace_core", + "dsoftbus_standard:softbus_client", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + ] + + subsystem_name = "resourceschedule" + part_name = "frame_aware_sched" } config("frame_msg_intf_config") { - visibility = [ ":*" ] - - include_dirs = [ - "${innerkits_path}/frameintf", - "//third_party/libxml2/include", - "${framework_path}/frame_aware_policy/include", - "${frame_aware_path}/common/include", - "//base/hiviewdfx/interfaces/innerkits/libhilog/include", - "//base/hiviewdfx/interfaces/innerkits/libhitrace/include", - ] + visibility = [ ":*" ] + + include_dirs = [ + "${innerkits_path}/frameintf", + "//third_party/libxml2/include", + "${framework_path}/frame_aware_policy/include", + "${frame_aware_path}/common/include", + "//base/hiviewdfx/interfaces/innerkits/libhilog/include", + "//base/hiviewdfx/interfaces/innerkits/libhitrace/include", + ] } ohos_shared_library("frame_msg_intf") { - sources = [ - "frame_msg_intf.cpp", - "${framework_path}/frame_aware_policy/src/intellisense_server.cpp", - "${framework_path}/frame_aware_policy/src/app_info.cpp", - "${framework_path}/frame_aware_policy/src/app_info_mgr.cpp", - "${framework_path}/frame_aware_policy/src/para_config.cpp", - "${framework_path}/frame_aware_policy/src/rtg_msg_mgr.cpp", - "${frame_aware_path}/interfaces/innerkits/frameintf/rtg_interface.cpp", - ] - - configs = [ ":frame_msg_intf_config" ] - - deps = [ - "//third_party/libxml2:xml2", - "//utils/native/base:utils", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - ] - - external_deps = [ - "bytrace_standard:bytrace_core", - "hiviewdfx_hilog_native:libhilog", - "dsoftbus_standard:softbus_client", - "ipc:ipc_core", - ] - - subsystem_name = "resourceschedule" - part_name = "frame_aware_sched" + sources = [ + "${frame_aware_path}/interfaces/innerkits/frameintf/rtg_interface.cpp", + "${framework_path}/frame_aware_policy/src/app_info.cpp", + "${framework_path}/frame_aware_policy/src/app_info_mgr.cpp", + "${framework_path}/frame_aware_policy/src/intellisense_server.cpp", + "${framework_path}/frame_aware_policy/src/para_config.cpp", + "${framework_path}/frame_aware_policy/src/rtg_msg_mgr.cpp", + "frame_msg_intf.cpp", + ] + + configs = [ ":frame_msg_intf_config" ] + + deps = [ + "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//third_party/libxml2:xml2", + "//utils/native/base:utils", + ] + + external_deps = [ + "bytrace_standard:bytrace_core", + "dsoftbus_standard:softbus_client", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + ] + + subsystem_name = "resourceschedule" + part_name = "frame_aware_sched" } - ohos_shared_library("rtg_interface") { - sources = [ - "rtg_interface.cpp" - ] + sources = [ "rtg_interface.cpp" ] - include_dirs = [ - "${frame_aware_path}/common/include", - ] + include_dirs = [ "${frame_aware_path}/common/include" ] - external_deps = [ - "hiviewdfx_hilog_native:libhilog", - ] + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] - install_enable = true - part_name = "frame_aware_sched" + install_enable = true + part_name = "frame_aware_sched" } diff --git a/test/BUILD.gn b/test/BUILD.gn index 2ce9368..383e39e 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -14,88 +14,84 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import("//build/test.gni") -import("//foundation/resourceschedule/plugins/frame_aware_sched/frameaware.gni") +import("//foundation/resourceschedule/frame_aware_sched/frameaware.gni") module_output_path = "frameawareschedtest/" -frame_aware_sched_configs = [ "${innerkits_path}/frameintf:frame_msg_intf_config" ] +frame_aware_sched_configs = + [ "${innerkits_path}/frameintf:frame_msg_intf_config" ] frame_aware_sched_deps = [ - "//utils/native/base:utils", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "${innerkits_path}/frameintf:frame_ui_intf", - "${innerkits_path}/frameintf:frame_msg_intf", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "${innerkits_path}/frameintf:frame_msg_intf", + "${innerkits_path}/frameintf:frame_ui_intf", + "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", + "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//utils/native/base:utils", ] frame_aware_sched_external_deps = [ - "hiviewdfx_hilog_native:libhilog", - "ipc:ipc_core", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", ] frame_aware_sched_public_deps = [ "//third_party/googletest:gtest_main" ] - ohos_unittest("frame_ui_intf_test") { - module_out_path = module_output_path - configs = frame_aware_sched_configs + module_out_path = module_output_path + configs = frame_aware_sched_configs - sources = [ "unittest/phone/frame_ui_intf_test.cpp" ] + sources = [ "unittest/phone/frame_ui_intf_test.cpp" ] - deps = frame_aware_sched_deps - - if (is_standard_system) { - external_deps = frame_aware_sched_external_deps - public_deps = frame_aware_sched_public_deps - } - part_name = "frame_aware_sched" - subsystem_name = "resourceschedule" + deps = frame_aware_sched_deps + if (is_standard_system) { + external_deps = frame_aware_sched_external_deps + public_deps = frame_aware_sched_public_deps + } + part_name = "frame_aware_sched" + subsystem_name = "resourceschedule" } ohos_unittest("frame_msg_intf_test") { - module_out_path = module_output_path - - sources = [ "unittest/phone/frame_msg_intf_test.cpp" ] + module_out_path = module_output_path + + sources = [ "unittest/phone/frame_msg_intf_test.cpp" ] - configs = frame_aware_sched_configs + configs = frame_aware_sched_configs - deps = frame_aware_sched_deps + deps = frame_aware_sched_deps - if (is_standard_system) { - external_deps = frame_aware_sched_external_deps - public_deps = frame_aware_sched_public_deps - } + if (is_standard_system) { + external_deps = frame_aware_sched_external_deps + public_deps = frame_aware_sched_public_deps + } - part_name = "frame_aware_sched" - subsystem_name = "resourceschedule" + part_name = "frame_aware_sched" + subsystem_name = "resourceschedule" } ohos_unittest("rtg_interface_test") { - module_out_path = module_output_path - - sources = [ "unittest/phone/rtg_interface_test.cpp" ] + module_out_path = module_output_path - include_dirs = [ - "${frame_aware_path}/common/include", - ] + sources = [ "unittest/phone/rtg_interface_test.cpp" ] - deps = frame_aware_sched_deps + include_dirs = [ "${frame_aware_path}/common/include" ] - if (is_standard_system) { - external_deps = frame_aware_sched_external_deps - public_deps = frame_aware_sched_public_deps - } + deps = frame_aware_sched_deps - part_name = "frame_aware_sched" - subsystem_name = "resourceschedule" + if (is_standard_system) { + external_deps = frame_aware_sched_external_deps + public_deps = frame_aware_sched_public_deps + } + part_name = "frame_aware_sched" + subsystem_name = "resourceschedule" } group("frame_unittest") { - testonly = true - deps = [ - ":frame_msg_intf_test", - ":rtg_interface_test", - ] + testonly = true + deps = [ + ":frame_msg_intf_test", + ":rtg_interface_test", + ] } -- Gitee