From 4edc824499658973129f2cee998c60ca5b497d8d Mon Sep 17 00:00:00 2001 From: xiahaiqin Date: Wed, 19 Jan 2022 16:58:25 +0800 Subject: [PATCH] split dm from libwm Signed-off-by: xiahaiqin Change-Id: Ie2618822a2b67efbd4ac04b35a814aecfa6e03f3 --- frameworks/kits/ability/native/BUILD.gn | 3 +++ .../ability/native/src/ability_runtime/js_window_stage.cpp | 2 +- services/test/moduletest/ability_mgr_service_test/BUILD.gn | 1 + services/test/moduletest/ability_record_test/BUILD.gn | 1 + services/test/moduletest/ability_stack_test/BUILD.gn | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/frameworks/kits/ability/native/BUILD.gn b/frameworks/kits/ability/native/BUILD.gn index b261a5fdb01..05d03cfecf1 100644 --- a/frameworks/kits/ability/native/BUILD.gn +++ b/frameworks/kits/ability/native/BUILD.gn @@ -85,6 +85,8 @@ config("ability_public_config") { "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", "//foundation/windowmanager/interfaces/innerkits/wm", "//foundation/windowmanager/interfaces/kits/napi/window_runtime/window_napi", + "//third_party/jsoncpp/include", + "//third_party/json/include", ] } @@ -263,6 +265,7 @@ ohos_shared_library("abilitykit_native") { public_deps = [ "//base/global/i18n_standard/frameworks/intl:intl_util", "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", + "//foundation/ace/napi:ace_napi", "//foundation/graphic/standard:libwmclient", "//foundation/windowmanager/interfaces/kits/napi/window_runtime:window_native_kit", "//foundation/windowmanager/wm:libwm", diff --git a/frameworks/kits/ability/native/src/ability_runtime/js_window_stage.cpp b/frameworks/kits/ability/native/src/ability_runtime/js_window_stage.cpp index eb189da6dcc..279f10644b0 100644 --- a/frameworks/kits/ability/native/src/ability_runtime/js_window_stage.cpp +++ b/frameworks/kits/ability/native/src/ability_runtime/js_window_stage.cpp @@ -150,7 +150,7 @@ NativeValue* JsWindowStage::OnGetMainWindow(NativeEngine& engine, NativeCallback HILOG_INFO("JsWindowStage::OnGetMainWindow success"); } else { task.Reject(engine, CreateJsError(engine, - static_cast(WMError::WM_ERROR_NULLPTR), + static_cast(Rosen::WMError::WM_ERROR_NULLPTR), "JsWindowStage::OnGetMainWindow failed.")); } }; diff --git a/services/test/moduletest/ability_mgr_service_test/BUILD.gn b/services/test/moduletest/ability_mgr_service_test/BUILD.gn index aeac3912c01..e7fe509e983 100644 --- a/services/test/moduletest/ability_mgr_service_test/BUILD.gn +++ b/services/test/moduletest/ability_mgr_service_test/BUILD.gn @@ -96,6 +96,7 @@ ohos_moduletest("ability_mgr_module_test") { "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", diff --git a/services/test/moduletest/ability_record_test/BUILD.gn b/services/test/moduletest/ability_record_test/BUILD.gn index 2dcc730420b..d9015e65554 100644 --- a/services/test/moduletest/ability_record_test/BUILD.gn +++ b/services/test/moduletest/ability_record_test/BUILD.gn @@ -99,6 +99,7 @@ ohos_moduletest("AbilityRecordModuleTest") { "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", diff --git a/services/test/moduletest/ability_stack_test/BUILD.gn b/services/test/moduletest/ability_stack_test/BUILD.gn index d1eb94eff9e..5fcb51bb330 100644 --- a/services/test/moduletest/ability_stack_test/BUILD.gn +++ b/services/test/moduletest/ability_stack_test/BUILD.gn @@ -97,6 +97,7 @@ ohos_moduletest("ability_stack_module_test") { "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", -- Gitee