From f5e64d4ae1da9aad38dbdb08d8177af1ff22856b Mon Sep 17 00:00:00 2001 From: jiangzhijun8 Date: Tue, 9 Jul 2024 09:47:48 +0800 Subject: [PATCH] Issue: https://gitee.com/openharmony/ability_ability_runtime/issues/IABJ7H MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Comment: 整改input模块绝对路径 Signed-off-by: jiangzhijun8 --- frameworks/js/napi/inner/napi_common/BUILD.gn | 1 + frameworks/native/ability/native/BUILD.gn | 1 - interfaces/kits/native/ability/native/ability.h | 5 ++--- interfaces/kits/native/ability/native/ability_impl.h | 2 +- .../ability/native/ability_runtime/js_ability_context.h | 1 - interfaces/kits/native/ability/native/ui_ability.h | 1 - .../include/mock_ability_manager_client.h | 1 - .../ability_delegator_test/ability_delegator_module_test.cpp | 1 - .../ability_delegator/ability_delegator_test.cpp | 1 - 9 files changed, 4 insertions(+), 10 deletions(-) diff --git a/frameworks/js/napi/inner/napi_common/BUILD.gn b/frameworks/js/napi/inner/napi_common/BUILD.gn index 8392c3b08c..ab25ffcfaf 100644 --- a/frameworks/js/napi/inner/napi_common/BUILD.gn +++ b/frameworks/js/napi/inner/napi_common/BUILD.gn @@ -64,6 +64,7 @@ ohos_shared_library("napi_common") { public_external_deps = [ "ability_base:configuration", "bundle_framework:appexecfwk_core", + "input:libmmi-client", ] if (ability_runtime_graphics) { diff --git a/frameworks/native/ability/native/BUILD.gn b/frameworks/native/ability/native/BUILD.gn index 67b41ca7e1..26951af8f8 100644 --- a/frameworks/native/ability/native/BUILD.gn +++ b/frameworks/native/ability/native/BUILD.gn @@ -264,7 +264,6 @@ ohos_shared_library("abilitykit_native") { "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", - "image_framework:image", "init:libbegetutil", "ipc:ipc_core", "ipc:ipc_napi", diff --git a/interfaces/kits/native/ability/native/ability.h b/interfaces/kits/native/ability/native/ability.h index a8ef304d78..d43a274981 100644 --- a/interfaces/kits/native/ability/native/ability.h +++ b/interfaces/kits/native/ability/native/ability.h @@ -34,7 +34,6 @@ #include "fa_ability_context.h" #include "iability_callback.h" #include "want_agent.h" - #include "appexecfwk_errors.h" #include "iremote_object.h" #include "pac_map.h" @@ -46,8 +45,8 @@ #include "form_constants.h" #include "form_provider_info.h" #include "form_state_info.h" -#include "foundation/multimodalinput/input/interfaces/native/innerkits/event/include/key_event.h" -#include "foundation/multimodalinput/input/interfaces/native/innerkits/event/include/pointer_event.h" +#include "key_event.h" +#include "pointer_event.h" #include "session_info.h" #include "window_option.h" #include "window_scene.h" diff --git a/interfaces/kits/native/ability/native/ability_impl.h b/interfaces/kits/native/ability/native/ability_impl.h index 5430a2497d..a4b4b11ccf 100644 --- a/interfaces/kits/native/ability/native/ability_impl.h +++ b/interfaces/kits/native/ability/native/ability_impl.h @@ -25,7 +25,7 @@ #include "ability_manager_client.h" #include "ability_manager_interface.h" #ifdef SUPPORT_GRAPHICS -#include "foundation/multimodalinput/input/interfaces/native/innerkits/event/include/i_input_event_consumer.h" +#include "i_input_event_consumer.h" #endif namespace OHOS { namespace AppExecFwk { diff --git a/interfaces/kits/native/ability/native/ability_runtime/js_ability_context.h b/interfaces/kits/native/ability/native/ability_runtime/js_ability_context.h index 6a5afc2663..6add72c8c3 100644 --- a/interfaces/kits/native/ability/native/ability_runtime/js_ability_context.h +++ b/interfaces/kits/native/ability/native/ability_runtime/js_ability_context.h @@ -24,7 +24,6 @@ #include "ability_context.h" #include "js_free_install_observer.h" #include "js_runtime.h" - #include "event_handler.h" class NativeReference; diff --git a/interfaces/kits/native/ability/native/ui_ability.h b/interfaces/kits/native/ability/native/ui_ability.h index 59042592bb..11a2ffe903 100644 --- a/interfaces/kits/native/ability/native/ui_ability.h +++ b/interfaces/kits/native/ability/native/ui_ability.h @@ -28,7 +28,6 @@ #include "fa_ability_context.h" #include "iability_callback.h" #include "resource_config_helper.h" - #include "want.h" #ifdef SUPPORT_SCREEN diff --git a/test/mock/frameworks_kits_ability_native_test/include/mock_ability_manager_client.h b/test/mock/frameworks_kits_ability_native_test/include/mock_ability_manager_client.h index ea5d2fecac..d1b1b83b39 100644 --- a/test/mock/frameworks_kits_ability_native_test/include/mock_ability_manager_client.h +++ b/test/mock/frameworks_kits_ability_native_test/include/mock_ability_manager_client.h @@ -30,7 +30,6 @@ #include "iremote_object.h" #include "iremote_stub.h" #include "values_bucket.h" - #include "want.h" #define OPENFILENUM (1246) diff --git a/test/moduletest/ability_delegator_test/ability_delegator_module_test.cpp b/test/moduletest/ability_delegator_test/ability_delegator_module_test.cpp index 5af3293085..12a4f6f17e 100644 --- a/test/moduletest/ability_delegator_test/ability_delegator_module_test.cpp +++ b/test/moduletest/ability_delegator_test/ability_delegator_module_test.cpp @@ -36,7 +36,6 @@ #include "test_observer_stub.h" #include "test_observer.h" #include "test_runner.h" - #include "want.h" using namespace testing::ext; diff --git a/test/unittest/frameworks_kits_appkit_native_test/ability_delegator/ability_delegator_test.cpp b/test/unittest/frameworks_kits_appkit_native_test/ability_delegator/ability_delegator_test.cpp index 9168ca5fdc..3ce013cdae 100644 --- a/test/unittest/frameworks_kits_appkit_native_test/ability_delegator/ability_delegator_test.cpp +++ b/test/unittest/frameworks_kits_appkit_native_test/ability_delegator/ability_delegator_test.cpp @@ -40,7 +40,6 @@ #include "test_observer_stub.h" #include "test_observer.h" #include "test_runner.h" - #include "want.h" using namespace testing;