description

Signed-off-by: 小发发 <lianghui35@huawei.com>
This commit is contained in:
小发发 2024-11-19 19:29:29 +08:00
parent e9c7ee74b6
commit 39118fbc96
15 changed files with 74 additions and 142 deletions

View File

@ -61,8 +61,6 @@ ohos_unittest("accessibility_parcel_test") {
]
deps = [
"../../../../../../../third_party/googletest:gmock_main",
"../../../../../../../third_party/googletest:gtest_main",
"../../../../interfaces/innerkits/common:accessibility_common",
]
@ -73,6 +71,8 @@ ohos_unittest("accessibility_parcel_test") {
"hilog:libhilog",
"input:libmmi-client",
"ipc:ipc_single",
"googletest:gmock_main",
"googletest:gtest_main"
]
}

View File

@ -27,7 +27,6 @@ config("module_private_config") {
}
include_dirs = aams_mock_include_dirs
include_dirs += [
"${ability_runtime_inner_api_path}/ability_manager/include",
"../../../common/log/include",
"../include",
"./mock/include",
@ -73,8 +72,6 @@ ohos_unittest("accessibility_ui_test_ability_impl_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../common/interface:accessibility_interface",
"../../../interfaces/innerkits/common:accessibility_common",
]
@ -98,6 +95,8 @@ ohos_unittest("accessibility_ui_test_ability_impl_test") {
"ipc:ipc_core",
"os_account:os_account_innerkits",
"samgr:samgr_proxy",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
@ -161,8 +160,6 @@ ohos_unittest("accessible_ability_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../common/interface:accessibility_interface",
"../../../interfaces/innerkits/common:accessibility_common",
]
@ -192,6 +189,8 @@ ohos_unittest("accessible_ability_test") {
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}

View File

@ -12,7 +12,6 @@
# limitations under the License.
import("//build/test.gni")
import("../../../accessibility_aafwk.gni")
module_output_path = "accessibility/accessibility"
@ -25,11 +24,6 @@ config("module_private_config") {
}
include_dirs = [
"${ability_base_path}/interfaces/inner_api/base/include",
"${ability_base_path}/interfaces/kits/native/uri/include",
"${ability_base_path}/interfaces/kits/native/want/include",
"${ability_out_base_path}/notification/common_event_service/interfaces/inner_api",
"${ability_json_path}/notification/common_event_service/interfaces/inner_api",
"../../../services/interface/include",
"../include",
"../../../interfaces/innerkits/acfwk/include",
@ -61,8 +55,6 @@ ohos_unittest("ac_unit_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../common/interface:accessibility_interface",
"../../../interfaces/innerkits/common:accessibility_common",
]
@ -85,6 +77,8 @@ ohos_unittest("ac_unit_test") {
"ipc:ipc_core",
"power_manager:powermgr_client",
"samgr:samgr_proxy",
"googletest:gmock_main",
"googletest:gtest_main"
]
}

View File

@ -12,7 +12,6 @@
# limitations under the License.
import("//build/test.gni")
import("../../../accessibility_aafwk.gni")
module_output_path = "accessibility/accessibility"
@ -60,8 +59,6 @@ ohos_unittest("asac_unit_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../common/interface:accessibility_interface",
"../../../interfaces/innerkits/common:accessibility_common",
]
@ -84,6 +81,8 @@ ohos_unittest("asac_unit_test") {
"init:libbegetutil",
"ipc:ipc_core",
"samgr:samgr_proxy",
"googletest:gmock_main",
"googletest:gtest_main"
]
}

View File

@ -49,12 +49,14 @@ ohos_unittest("accessibility_common_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../interfaces/innerkits/common:accessibility_common",
]
external_deps = [ "hilog:libhilog" ]
external_deps = [
"hilog:libhilog",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
###############################################################################

View File

@ -12,7 +12,6 @@
# limitations under the License.
import("//build/ohos.gni")
import("../../../accessibility_aafwk.gni")
import("../../../accessibility_manager_service.gni")
aafwk_path = "../../../frameworks/aafwk"

View File

@ -12,7 +12,6 @@
# limitations under the License.
import("//build/ohos.gni")
import("../../../accessibility_aafwk.gni")
ohos_shared_library("accessibility_napi") {
branch_protector_ret = "pac_ret"

View File

@ -12,8 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import(
"../../../../../../../arkcompiler/ets_frontend/es2panda/es2abc_config.gni")
import("//build/templates/abc/ohos_abc.gni")
es2abc_gen_abc("gen_accessibility_extension_abc") {
src_js = rebase_path("accessibility_extension.js")

View File

@ -12,8 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import(
"../../../../../../../arkcompiler/ets_frontend/es2panda/es2abc_config.gni")
import("//build/templates/abc/ohos_abc.gni")
es2abc_gen_abc("gen_accessibility_extension_context_abc") {
src_js = rebase_path("accessibility_extension_context.js")

View File

@ -37,22 +37,7 @@ config("module_private_config") {
"../../test/mock/common",
"../../../common/interface/include",
"../../../common/interface/include/parcel",
"${ability_base_path}/interfaces/inner_api/base/include",
"${ability_base_path}/interfaces/kits/native/uri/include",
"${ability_base_path}/interfaces/kits/native/want/include",
"${ability_runtime_path}/interfaces/kits/native/ability/native/",
"${ability_runtime_path}/interfaces/kits/native/appkit/app/",
"${ability_runtime_inner_api_path}/ability_manager/include",
"${ability_runtime_inner_api_path}/app_manager/include/appmgr/",
"${ability_runtime_services_path}/abilitymgr/include",
"mock",
"../../../../graphic/graphic_2d/rosen/modules/render_service_base/include",
"../../../../graphic/graphic_2d/rosen/modules/2d_graphics/include",
"../../../../multimedia/image_framework/interfaces/innerkits/include",
"../../../../multimedia/image_framework/interfaces/kits/native/include",
"../../../../window/window_manager/previewer/mock",
"../../../../multimodalinput/input/util/common/include",
"../../../../window/window_manager/utils/include",
]
defines = [
@ -110,8 +95,6 @@ ohos_unittest("accessibility_account_data_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../common/interface:accessibility_interface",
"../../../interfaces/innerkits/common:accessibility_common",
]
@ -146,6 +129,8 @@ ohos_unittest("accessibility_account_data_test") {
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
@ -205,8 +190,6 @@ ohos_unittest("accessible_ability_manager_service_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../common/interface:accessibility_interface",
"../../../interfaces/innerkits/common:accessibility_common",
]
@ -241,6 +224,8 @@ ohos_unittest("accessible_ability_manager_service_test") {
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
@ -290,8 +275,6 @@ ohos_unittest("accessibility_touch_exploration_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../interfaces/innerkits/common:accessibility_common",
]
@ -322,6 +305,9 @@ ohos_unittest("accessibility_touch_exploration_test") {
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main",
"power_manager:powermgr_client"
]
}
@ -376,8 +362,6 @@ ohos_unittest("accessibility_common_event_registry_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../common/interface:accessibility_interface",
"../../../interfaces/innerkits/common:accessibility_common",
]
@ -412,6 +396,8 @@ ohos_unittest("accessibility_common_event_registry_test") {
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
@ -471,8 +457,6 @@ ohos_unittest("accessibility_input_interceptor_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../common/interface:accessibility_interface",
"../../../interfaces/innerkits/common:accessibility_common",
]
@ -507,6 +491,8 @@ ohos_unittest("accessibility_input_interceptor_test") {
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
@ -562,8 +548,6 @@ ohos_unittest("accessibility_window_manager_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../common/interface:accessibility_interface",
"../../../interfaces/innerkits/common:accessibility_common",
]
@ -598,6 +582,8 @@ ohos_unittest("accessibility_window_manager_test") {
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
@ -644,8 +630,6 @@ ohos_unittest("accessibility_keyevent_filter_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../common/interface:accessibility_interface",
"../../../interfaces/innerkits/common:accessibility_common",
]
@ -680,6 +664,8 @@ ohos_unittest("accessibility_keyevent_filter_test") {
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
@ -742,8 +728,6 @@ ohos_unittest("accessible_ability_connection_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../common/interface:accessibility_interface",
"../../../interfaces/innerkits/common:accessibility_common",
]
@ -783,6 +767,8 @@ ohos_unittest("accessible_ability_connection_test") {
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
@ -802,8 +788,6 @@ ohos_unittest("accessibility_display_manager_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../common/interface:accessibility_interface",
]
@ -829,6 +813,8 @@ ohos_unittest("accessibility_display_manager_test") {
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
@ -872,8 +858,6 @@ ohos_unittest("accessibility_dumper_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../interfaces/innerkits/common:accessibility_common",
]
@ -903,6 +887,9 @@ ohos_unittest("accessibility_dumper_test") {
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main",
"power_manager:powermgr_client"
]
}
@ -956,8 +943,6 @@ ohos_unittest("accessibility_touchevent_injector_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../common/interface:accessibility_interface",
"../../../interfaces/innerkits/common:accessibility_common",
]
@ -992,6 +977,8 @@ ohos_unittest("accessibility_touchevent_injector_test") {
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
@ -1041,8 +1028,6 @@ ohos_unittest("accessible_ability_channel_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../interfaces/innerkits/common:accessibility_common",
]
@ -1075,6 +1060,8 @@ ohos_unittest("accessible_ability_channel_test") {
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
@ -1128,8 +1115,6 @@ ohos_unittest("accessibility_mouse_autoclick_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../common/interface:accessibility_interface",
"../../../interfaces/innerkits/common:accessibility_common",
]
@ -1164,6 +1149,8 @@ ohos_unittest("accessibility_mouse_autoclick_test") {
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
@ -1217,8 +1204,6 @@ ohos_unittest("accessibility_screen_touch_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../common/interface:accessibility_interface",
"../../../interfaces/innerkits/common:accessibility_common",
]
@ -1253,6 +1238,8 @@ ohos_unittest("accessibility_screen_touch_test") {
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
@ -1272,8 +1259,6 @@ ohos_unittest("accessibility_mouse_key_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../interfaces/innerkits/common:accessibility_common",
]
@ -1299,6 +1284,8 @@ ohos_unittest("accessibility_mouse_key_test") {
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
@ -1352,8 +1339,6 @@ ohos_unittest("accessibility_short_key_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../common/interface:accessibility_interface",
"../../../interfaces/innerkits/common:accessibility_common",
]
@ -1388,6 +1373,8 @@ ohos_unittest("accessibility_short_key_test") {
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
@ -1434,8 +1421,6 @@ ohos_unittest("accessibility_short_key_dialog_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../common/interface:accessibility_interface",
"../../../interfaces/innerkits/common:accessibility_common",
]
@ -1470,6 +1455,8 @@ ohos_unittest("accessibility_short_key_dialog_test") {
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
@ -1515,8 +1502,6 @@ ohos_unittest("accessibility_settings_config_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../common/interface:accessibility_interface",
"../../../interfaces/innerkits/common:accessibility_common",
]
@ -1551,6 +1536,8 @@ ohos_unittest("accessibility_settings_config_test") {
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
@ -1604,8 +1591,6 @@ ohos_unittest("accessibility_zoom_gesture_test") {
]
deps = [
"../../../../../../third_party/googletest:gmock_main",
"../../../../../../third_party/googletest:gtest_main",
"../../../common/interface:accessibility_interface",
"../../../interfaces/innerkits/common:accessibility_common",
]
@ -1640,6 +1625,8 @@ ohos_unittest("accessibility_zoom_gesture_test") {
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}

View File

@ -15,7 +15,7 @@
#include <gtest/gtest.h>
#include "display.h"
#include "window/window_manager/utils/include/display_info.h"
#include "display_info.h"
namespace OHOS::Rosen {
namespace {

View File

@ -41,16 +41,7 @@ config("module_private_config") {
"../aams/include",
"mock",
"./mock/common",
"${ability_runtime_path}/interfaces/kits/native/ability/native/",
"${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime",
"${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context",
"${ability_runtime_path}/interfaces/kits/native/appkit/app/",
"${ability_runtime_inner_api_path}/ability_manager/include",
"${ability_runtime_inner_api_path}/app_manager/include/appmgr",
"${ability_runtime_services_path}/abilitymgr/include",
"mock/aafwk/include",
"${AAMS_FOUNDATION_PATH}/window/window_manager/utils/include",
"../../../graphic/graphic_2d/rosen/modules/2d_graphics/include",
"mock/aafwk/include"
]
defines = [
@ -125,8 +116,6 @@ ohos_moduletest("aams_accessibility_touch_exploration_test") {
]
deps = [
"../../../../../third_party/googletest:gmock_main",
"../../../../../third_party/googletest:gtest_main",
"../../common/interface:accessibility_interface",
"../../interfaces/innerkits/common:accessibility_common",
]
@ -159,6 +148,8 @@ ohos_moduletest("aams_accessibility_touch_exploration_test") {
"power_manager:powermgr_client",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
@ -224,8 +215,6 @@ ohos_moduletest("aams_accessibility_touchEvent_injector_test") {
]
deps = [
"../../../../../third_party/googletest:gmock_main",
"../../../../../third_party/googletest:gtest_main",
"../../common/interface:accessibility_interface",
"../../interfaces/innerkits/common:accessibility_common",
]
@ -258,6 +247,8 @@ ohos_moduletest("aams_accessibility_touchEvent_injector_test") {
"power_manager:powermgr_client",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
@ -329,8 +320,6 @@ ohos_moduletest("aams_accessible_ability_channel_test") {
]
deps = [
"../../../../../third_party/googletest:gmock_main",
"../../../../../third_party/googletest:gtest_main",
"../../common/interface:accessibility_interface",
"../../interfaces/innerkits/common:accessibility_common",
]
@ -362,6 +351,8 @@ ohos_moduletest("aams_accessible_ability_channel_test") {
"power_manager:powermgr_client",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
@ -431,8 +422,6 @@ ohos_moduletest("aams_server_test") {
]
deps = [
"../../../../../third_party/googletest:gmock_main",
"../../../../../third_party/googletest:gtest_main",
"../../common/interface:accessibility_interface",
"../../interfaces/innerkits/common:accessibility_common",
]
@ -464,6 +453,8 @@ ohos_moduletest("aams_server_test") {
"power_manager:powermgr_client",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
@ -527,8 +518,6 @@ ohos_moduletest("aams_accessibility_keyevent_filter_test") {
]
deps = [
"../../../../../third_party/googletest:gmock_main",
"../../../../../third_party/googletest:gtest_main",
"../../common/interface:accessibility_interface",
"../../interfaces/innerkits/common:accessibility_common",
]
@ -561,6 +550,8 @@ ohos_moduletest("aams_accessibility_keyevent_filter_test") {
"power_manager:powermgr_client",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}
@ -630,8 +621,6 @@ ohos_moduletest("aams_common_event_registry_test") {
]
deps = [
"../../../../../third_party/googletest:gmock_main",
"../../../../../third_party/googletest:gtest_main",
"../../common/interface:accessibility_interface",
"../../interfaces/innerkits/common:accessibility_common",
]
@ -663,6 +652,8 @@ ohos_moduletest("aams_common_event_registry_test") {
"power_manager:powermgr_client",
"window_manager:libdm",
"window_manager:libwm",
"googletest:gmock_main",
"googletest:gtest_main"
]
}

View File

@ -11,11 +11,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
ability_base_path = "//foundation/ability/ability_base"
ability_runtime_path = "//foundation/ability/ability_runtime"
ability_runtime_inner_api_path = "${ability_runtime_path}/interfaces/inner_api"
ability_runtime_kits_path = "${ability_runtime_path}/frameworks/kits"
ability_runtime_services_path = "${ability_runtime_path}/services"
AAMS_MOCK_PATH = "//foundation/barrierfree/accessibility/services/test/mock"
AAMS_FRAMEWORKS_PATH = "//foundation/barrierfree/accessibility/frameworks"
AAMS_INTERFACES_PATH = "//foundation/barrierfree/accessibility/interfaces"
@ -26,38 +21,7 @@ AAMS_FOUNDATION_PATH = "//foundation"
aams_mock_include_dirs = [
"$AAMS_MOCK_PATH/distributeddatamgr/include",
"$AAMS_MOCK_PATH/multimodalinput/include",
"$AAMS_MOCK_PATH/powermanager/include",
"//base/global/resource_management/interfaces/inner_api/include",
"//base/hiviewdfx/hiview/adapter/utility/include/extra/singleton.h",
"//base/notification/common_event_service/interfaces/inner_api",
"//base/notification/eventhandler/interfaces/inner_api",
"//base/powermgr/display_manager/utils/native/include",
"//foundation",
"//foundation/arkui/napi/native_engine",
"//foundation/distributeddatamgr/preferences/interfaces/inner_api/include",
"//foundation/multimodalinput/input/interfaces/native/innerkits/proxy/include",
"//foundation/distributeddatamgr/data_share/interfaces/inner_api/common/include",
"//foundation/multimodalinput/input/interfaces/native/innerkits/event/include",
"//base/powermgr/power_manager/interfaces/inner_api/native/include",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_base/include",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_core/include",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_core/include/bundlemgr",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include",
"//foundation/multimedia/image_framework/interfaces/kits/native/include",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
"//foundation/multimodalinput/input/util/common/include",
"//foundation/window/window_manager/dm/include",
"//foundation/window/window_manager/interfaces/innerkits",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//foundation/window/window_manager/interfaces/innerkits/wm",
"//foundation/window/window_manager/utils/include",
"//third_party/jsoncpp/include",
"//third_party/jsoncpp/include/json",
"//commonlibrary/c_utils/base/include",
"//utils/system/safwk/native/include",
"$AAMS_MOCK_PATH/powermanager/include"
]
aams_mock_distributeddatamgr_src =

View File

@ -14,7 +14,7 @@
*/
#include "display.h"
#include "window/window_manager/utils/include/display_info.h"
#include "display_info.h"
namespace OHOS::Rosen {
namespace {

View File

@ -18,7 +18,7 @@
#include "display.h"
#include "dm_common.h"
#include "singleton_delegator.h"
#include "window/window_manager/utils/include/display_info.h"
#include "display_info.h"
namespace OHOS::Rosen {
WM_IMPLEMENT_SINGLE_INSTANCE(DisplayManager)