回退 'Pull Request !2417 : build: 适配电源子系统目录结构更改'

This commit is contained in:
openharmony_ci 2023-03-31 00:59:33 +00:00 committed by Gitee
parent 857da38c53
commit b2d792e08c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 5 additions and 58 deletions

View File

@ -55,8 +55,6 @@ ohos_systemtest("wms_window_layout_test") {
sources = [ "window_layout_test.cpp" ]
deps = [ ":wms_systemtest_common" ]
external_deps = [ "power_manager:powermgr_client" ]
}
ohos_systemtest("wms_window_effect_test") {
@ -65,8 +63,6 @@ ohos_systemtest("wms_window_effect_test") {
sources = [ "window_effect_test.cpp" ]
deps = [ ":wms_systemtest_common" ]
external_deps = [ "power_manager:powermgr_client" ]
}
ohos_systemtest("wms_window_multi_ability_test") {
@ -75,8 +71,6 @@ ohos_systemtest("wms_window_multi_ability_test") {
sources = [ "window_multi_ability_test.cpp" ]
deps = [ ":wms_systemtest_common" ]
external_deps = [ "power_manager:powermgr_client" ]
}
ohos_systemtest("wms_window_subwindow_test") {
@ -96,10 +90,7 @@ ohos_systemtest("wms_window_systemsubwindow_test") {
deps = [ ":wms_systemtest_common" ]
external_deps = [
"bundle_framework:appexecfwk_base",
"power_manager:powermgr_client",
]
external_deps = [ "bundle_framework:appexecfwk_base" ]
}
ohos_systemtest("wms_window_dialogwindow_test") {
@ -118,11 +109,6 @@ ohos_systemtest("wms_window_immersive_test") {
sources = [ "window_immersive_test.cpp" ]
deps = [ ":wms_systemtest_common" ]
external_deps = [
"bundle_framework:appexecfwk_base",
"power_manager:powermgr_client",
]
}
ohos_systemtest("wms_window_focus_test") {
@ -131,11 +117,6 @@ ohos_systemtest("wms_window_focus_test") {
sources = [ "window_focus_test.cpp" ]
deps = [ ":wms_systemtest_common" ]
external_deps = [
"bundle_framework:appexecfwk_base",
"power_manager:powermgr_client",
]
}
ohos_systemtest("wms_window_split_immersive_test") {
@ -144,8 +125,6 @@ ohos_systemtest("wms_window_split_immersive_test") {
sources = [ "window_split_immersive_test.cpp" ]
deps = [ ":wms_systemtest_common" ]
external_deps = [ "power_manager:powermgr_client" ]
}
ohos_systemtest("wms_window_split_test") {
@ -154,8 +133,6 @@ ohos_systemtest("wms_window_split_test") {
sources = [ "window_split_test.cpp" ]
deps = [ ":wms_systemtest_common" ]
external_deps = [ "power_manager:powermgr_client" ]
}
ohos_systemtest("wms_window_move_drag_test") {
@ -165,10 +142,7 @@ ohos_systemtest("wms_window_move_drag_test") {
deps = [ ":wms_systemtest_common" ]
external_deps = [
"bundle_framework:appexecfwk_base",
"power_manager:powermgr_client",
]
external_deps = [ "bundle_framework:appexecfwk_base" ]
}
ohos_systemtest("wms_window_input_method_test") {
@ -177,8 +151,6 @@ ohos_systemtest("wms_window_input_method_test") {
sources = [ "window_input_method_test.cpp" ]
deps = [ ":wms_systemtest_common" ]
external_deps = [ "power_manager:powermgr_client" ]
}
ohos_systemtest("wms_window_gamut_test") {
@ -187,8 +159,6 @@ ohos_systemtest("wms_window_gamut_test") {
sources = [ "window_gamut_test.cpp" ]
deps = [ ":wms_systemtest_common" ]
external_deps = [ "power_manager:powermgr_client" ]
}
ohos_systemtest("wms_window_gesture_navigation_enabled_test") {
@ -205,8 +175,6 @@ ohos_systemtest("wms_window_input_test") {
sources = [ "window_input_test.cpp" ]
deps = [ ":wms_systemtest_common" ]
external_deps = [ "power_manager:powermgr_client" ]
}
ohos_systemtest("wms_window_visibility_info_test") {
@ -215,8 +183,6 @@ ohos_systemtest("wms_window_visibility_info_test") {
sources = [ "window_visibility_info_test.cpp" ]
deps = [ ":wms_systemtest_common" ]
external_deps = [ "power_manager:powermgr_client" ]
}
ohos_systemtest("wms_window_display_zoom_test") {
@ -225,8 +191,6 @@ ohos_systemtest("wms_window_display_zoom_test") {
sources = [ "window_display_zoom_test.cpp" ]
deps = [ ":wms_systemtest_common" ]
external_deps = [ "power_manager:powermgr_client" ]
}
ohos_systemtest("wms_window_drag_test") {
@ -235,8 +199,6 @@ ohos_systemtest("wms_window_drag_test") {
sources = [ "window_drag_test.cpp" ]
deps = [ ":wms_systemtest_common" ]
external_deps = [ "power_manager:powermgr_client" ]
}
ohos_systemtest("wms_window_raisetoapptop_test") {
@ -245,8 +207,6 @@ ohos_systemtest("wms_window_raisetoapptop_test") {
sources = [ "window_raisetoapptop_test.cpp" ]
deps = [ ":wms_systemtest_common" ]
external_deps = [ "power_manager:powermgr_client" ]
}
ohos_systemtest("wms_window_rotation_test") {
@ -255,8 +215,6 @@ ohos_systemtest("wms_window_rotation_test") {
sources = [ "window_rotation_test.cpp" ]
deps = [ ":wms_systemtest_common" ]
external_deps = [ "power_manager:powermgr_client" ]
}
ohos_systemtest("wms_window_occupied_area_change_test") {
@ -265,8 +223,6 @@ ohos_systemtest("wms_window_occupied_area_change_test") {
sources = [ "window_occupied_area_change_test.cpp" ]
deps = [ ":wms_systemtest_common" ]
external_deps = [ "power_manager:powermgr_client" ]
}
ohos_systemtest("wms_window_touch_outside_test") {
@ -275,8 +231,6 @@ ohos_systemtest("wms_window_touch_outside_test") {
sources = [ "window_touch_outside_test.cpp" ]
deps = [ ":wms_systemtest_common" ]
external_deps = [ "power_manager:powermgr_client" ]
}
ohos_systemtest("wms_window_mode_support_info_test") {
@ -285,8 +239,6 @@ ohos_systemtest("wms_window_mode_support_info_test") {
sources = [ "window_mode_support_info_test.cpp" ]
deps = [ ":wms_systemtest_common" ]
external_deps = [ "power_manager:powermgr_client" ]
}
ohos_systemtest("wms_window_app_floating_window_test") {
@ -295,8 +247,6 @@ ohos_systemtest("wms_window_app_floating_window_test") {
sources = [ "window_app_floating_window_test.cpp" ]
deps = [ ":wms_systemtest_common" ]
external_deps = [ "power_manager:powermgr_client" ]
}
ohos_systemtest("wms_window_animation_transition_test") {
@ -305,8 +255,6 @@ ohos_systemtest("wms_window_animation_transition_test") {
sources = [ "window_animation_transition_test.cpp" ]
deps = [ ":wms_systemtest_common" ]
external_deps = [ "power_manager:powermgr_client" ]
}
ohos_systemtest("wms_window_water_mark_test") {
@ -315,8 +263,6 @@ ohos_systemtest("wms_window_water_mark_test") {
sources = [ "window_water_mark_test.cpp" ]
deps = [ ":wms_systemtest_common" ]
external_deps = [ "power_manager:powermgr_client" ]
}
## Build wms_systemtest_common.a {{{
@ -356,6 +302,7 @@ ohos_static_library("wms_systemtest_common") {
]
public_deps = [
"//base/powermgr/power_manager/interfaces/innerkits:powermgr_client",
"//foundation/arkui/ace_engine/interfaces/inner_api/ace:ace_uicontent",
# need delete it for abilitycontext
@ -379,7 +326,6 @@ ohos_static_library("wms_systemtest_common") {
"ability_runtime:ability_context_native",
"bundle_framework:appexecfwk_base",
"ipc:ipc_core",
"power_manager:powermgr_client",
]
}
## Build wms_systemtest_common.a }}}

View File

@ -183,6 +183,8 @@ ohos_static_library("wm_unittest_common") {
]
public_deps = [
"//base/powermgr/power_manager/interfaces/innerkits:powermgr_client",
# need delete it for abilitycontext
"${ability_runtime_inner_api_path}/ability_manager:ability_manager",
"//commonlibrary/c_utils/base:utils",
@ -207,7 +209,6 @@ ohos_static_library("wm_unittest_common") {
"ability_runtime:ability_context_native",
"bundle_framework:appexecfwk_base",
"ipc:ipc_core",
"power_manager:powermgr_client",
]
}
## Build wm_unittest_common.a }}}