From 0f7652794c8387f87e38058a7e0379b2307b04b2 Mon Sep 17 00:00:00 2001 From: zhangxiao72 Date: Wed, 27 Apr 2022 14:22:19 +0800 Subject: [PATCH] =?UTF-8?q?ace=5Fengine=E3=80=81napi=20=E9=83=A8=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E4=BB=93=E5=90=8D=E5=92=8C=E7=9B=AE=E5=BD=95=E5=90=8D?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iad3663ca5a4150ebf17973f26f52c8dc8d931a9f Signed-off-by: zhangxiao72 --- .../show_confirm_dialog/dialog_ui/js/BUILD.gn | 2 +- ext/pin_auth/BUILD.gn | 2 +- .../input_pin_dialog/dialog_ui/js/BUILD.gn | 2 +- ext/pin_auth/show_pin_dialog/dialog_ui/js/BUILD.gn | 2 +- interfaces/kits/js/BUILD.gn | 6 +++--- services/devicemanagerservice/BUILD.gn | 2 +- test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn | 14 +++++++------- test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn | 8 ++++---- test/fuzztest/ipccmdregister_fuzzer/BUILD.gn | 8 ++++---- test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn | 8 ++++---- test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn | 8 ++++---- test/fuzztest/ipcserverstub_fuzzer/BUILD.gn | 8 ++++---- 12 files changed, 35 insertions(+), 35 deletions(-) diff --git a/common/include/show_confirm_dialog/dialog_ui/js/BUILD.gn b/common/include/show_confirm_dialog/dialog_ui/js/BUILD.gn index 6ee250ed9..471fb4416 100644 --- a/common/include/show_confirm_dialog/dialog_ui/js/BUILD.gn +++ b/common/include/show_confirm_dialog/dialog_ui/js/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//foundation/ace/ace_engine/build/ace_gen_sa_dialog_js.gni") +import("//foundation/arkui/ace_engine/build/ace_gen_sa_dialog_js.gni") import("//foundation/distributedhardware/devicemanager/devicemanager.gni") gen_sa_dialog_js("dialog_js_files_etc") { diff --git a/ext/pin_auth/BUILD.gn b/ext/pin_auth/BUILD.gn index 6ee848c2b..477009980 100644 --- a/ext/pin_auth/BUILD.gn +++ b/ext/pin_auth/BUILD.gn @@ -142,7 +142,7 @@ if (defined(ohos_lite)) { "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", + "//foundation/arkui/ace_engine/interfaces/inner_api/ui_service_manager:ui_service_mgr", "//foundation/distributedhardware/devicemanager/services/devicemanagerservice:devicemanagerservice", "//foundation/windowmanager/wm:libwm", "//utils/native/base:utils", diff --git a/ext/pin_auth/input_pin_dialog/dialog_ui/js/BUILD.gn b/ext/pin_auth/input_pin_dialog/dialog_ui/js/BUILD.gn index c25fa1ec3..72be3dd85 100644 --- a/ext/pin_auth/input_pin_dialog/dialog_ui/js/BUILD.gn +++ b/ext/pin_auth/input_pin_dialog/dialog_ui/js/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//foundation/ace/ace_engine/build/ace_gen_sa_dialog_js.gni") +import("//foundation/arkui/ace_engine/build/ace_gen_sa_dialog_js.gni") import("//foundation/distributedhardware/devicemanager/devicemanager.gni") gen_sa_dialog_js("dialog_js_files_etc") { diff --git a/ext/pin_auth/show_pin_dialog/dialog_ui/js/BUILD.gn b/ext/pin_auth/show_pin_dialog/dialog_ui/js/BUILD.gn index d0042194c..2fe9a1de7 100644 --- a/ext/pin_auth/show_pin_dialog/dialog_ui/js/BUILD.gn +++ b/ext/pin_auth/show_pin_dialog/dialog_ui/js/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//foundation/ace/ace_engine/build/ace_gen_sa_dialog_js.gni") +import("//foundation/arkui/ace_engine/build/ace_gen_sa_dialog_js.gni") import("//foundation/distributedhardware/devicemanager/devicemanager.gni") gen_sa_dialog_js("dialog_js_files_etc") { diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn index 50833f2c2..d787aa0f4 100644 --- a/interfaces/kits/js/BUILD.gn +++ b/interfaces/kits/js/BUILD.gn @@ -25,8 +25,8 @@ ohos_shared_library("devicemanager") { "${innerkits_path}/native_cpp/include/ipc/standard", "//third_party/node/src", "//third_party/json/include", - "//foundation/ace/napi/native_engine", - "//foundation/ace/napi/interfaces/kits", + "//foundation/arkui/napi/native_engine", + "//foundation/arkui/napi/interfaces/kits", "//utils/native/base/include", ] @@ -37,7 +37,7 @@ ohos_shared_library("devicemanager") { deps = [ "${utils_path}:devicemanagerutils", - "//foundation/ace/napi:ace_napi", + "//foundation/arkui/napi:ace_napi", "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//utils/native/base:utils", ] diff --git a/services/devicemanagerservice/BUILD.gn b/services/devicemanagerservice/BUILD.gn index 8dd66839c..e632cb4f3 100755 --- a/services/devicemanagerservice/BUILD.gn +++ b/services/devicemanagerservice/BUILD.gn @@ -313,7 +313,7 @@ if (defined(ohos_lite)) { if (!device_manager_base_no_interaction_auth) { deps += [ "${common_path}/include/show_confirm_dialog/dialog_ui/js:dialog_js_files_etc", - "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", + "//foundation/arkui/ace_engine/interfaces/inner_api/ui_service_manager:ui_service_mgr", "//foundation/windowmanager/wm:libwm", ] defines += [ "SUPPORT_GRAPHICS" ] diff --git a/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn b/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn index 33fbe6d2e..b6a52b181 100644 --- a/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn +++ b/test/fuzztest/devicemanagerimpl_fuzzer/BUILD.gn @@ -23,8 +23,8 @@ ohos_fuzztest("DeviceManagerImplFuzzTest") { include_dirs = [ "${utils_path}/include", - "//foundation/ace/napi/native_engine", - "//foundation/ace/napi/interfaces/kits", + "//foundation/arkui/napi/native_engine", + "//foundation/arkui/napi/interfaces/kits", "//utils/native/base/include", "//utils/system/safwk/native/include", "${innerkits_path}/native_cpp/include", @@ -70,8 +70,8 @@ ohos_fuzztest("DeviceManagerImplFuzzTest") { "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", "//foundation/appexecfwk/appexecfwk_lite/interfaces/kits/bundle_lite", - "//foundation/ace/napi/interfaces/innerkits/napi", - "//foundation/ace/napi/interfaces/innerkits", + "//foundation/arkui/napi/interfaces/inner_api/napi", + "//foundation/arkui/napi/interfaces/innerkits", "//third_party/jsframework/runtime/main/extend", "//foundation/windowmanager/interfaces/kits", "//third_party/jsframework/runtime/main/extend/systemplugin", @@ -80,8 +80,8 @@ ohos_fuzztest("DeviceManagerImplFuzzTest") { "//third_party/libuv/include", "//foundation/distributedhardware/devicemanager/interfaces/kits/js/include", "//third_party/node/src", - "//foundation/ace/napi/native_engine", - "//foundation/ace/napi/interfaces/kits", + "//foundation/arkui/napi/native_engine", + "//foundation/arkui/napi/interfaces/kits", ] cflags = [ @@ -94,7 +94,7 @@ ohos_fuzztest("DeviceManagerImplFuzzTest") { deps = [ "${utils_path}:devicemanagerutils", - "//foundation/ace/napi:ace_napi", + "//foundation/arkui/napi:ace_napi", "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//utils/native/base:utils", ] diff --git a/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn b/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn index 9674e392a..638f73046 100644 --- a/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcclientmanager_fuzzer/BUILD.gn @@ -25,8 +25,8 @@ ohos_fuzztest("IpcClientManagerFuzzTest") { "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp/include", "//foundation/distributedhardware/devicemanager/interfaces/kits/js/include", "//third_party/node/src", - "//foundation/ace/napi/native_engine", - "//foundation/ace/napi/interfaces/kits", + "//foundation/arkui/napi/native_engine", + "//foundation/arkui/napi/interfaces/kits", "//utils/native/base/include", "//utils/system/safwk/native/include", "${innerkits_path}/native_cpp/include", @@ -71,8 +71,8 @@ ohos_fuzztest("IpcClientManagerFuzzTest") { "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", "//third_party/json/include", "//foundation/appexecfwk/appexecfwk_lite/interfaces/kits/bundle_lite", - "//foundation/ace/napi/interfaces/innerkits/napi", - "//foundation/ace/napi/interfaces/innerkits", + "//foundation/arkui/napi/interfaces/inner_api/napi", + "//foundation/arkui/napi/interfaces/inner_api", "//third_party/jsframework/runtime/main/extend", "//foundation/windowmanager/interfaces/kits", "//third_party/jsframework/runtime/main/extend/systemplugin", diff --git a/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn b/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn index b549ab7e5..5cf5188fd 100644 --- a/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn +++ b/test/fuzztest/ipccmdregister_fuzzer/BUILD.gn @@ -25,8 +25,8 @@ ohos_fuzztest("IpcCmdRegisterFuzzTest") { "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp/include", "//foundation/distributedhardware/devicemanager/interfaces/kits/js/include", "//third_party/node/src", - "//foundation/ace/napi/native_engine", - "//foundation/ace/napi/interfaces/kits", + "//foundation/arkui/napi/native_engine", + "//foundation/arkui/napi/interfaces/kits", "//utils/native/base/include", "//utils/system/safwk/native/include", "${innerkits_path}/native_cpp/include", @@ -71,8 +71,8 @@ ohos_fuzztest("IpcCmdRegisterFuzzTest") { "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", "//third_party/json/include", "//foundation/appexecfwk/appexecfwk_lite/interfaces/kits/bundle_lite", - "//foundation/ace/napi/interfaces/innerkits/napi", - "//foundation/ace/napi/interfaces/innerkits", + "//foundation/arkui/napi/interfaces/inner_api/napi", + "//foundation/arkui/napi/interfaces/inner_api", "//third_party/jsframework/runtime/main/extend", "//foundation/windowmanager/interfaces/kits", "//third_party/jsframework/runtime/main/extend/systemplugin", diff --git a/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn b/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn index c3871de0e..4ba1a3b68 100644 --- a/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcserverclientproxy_fuzzer/BUILD.gn @@ -25,8 +25,8 @@ ohos_fuzztest("IpcServerClientProxyFuzzTest") { "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp/include", "//foundation/distributedhardware/devicemanager/interfaces/kits/js/include", "//third_party/node/src", - "//foundation/ace/napi/native_engine", - "//foundation/ace/napi/interfaces/kits", + "//foundation/arkui/napi/native_engine", + "//foundation/arkui/napi/interfaces/kits", "//utils/native/base/include", "//utils/system/safwk/native/include", "${innerkits_path}/native_cpp/include", @@ -71,8 +71,8 @@ ohos_fuzztest("IpcServerClientProxyFuzzTest") { "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", "//third_party/json/include", "//foundation/appexecfwk/appexecfwk_lite/interfaces/kits/bundle_lite", - "//foundation/ace/napi/interfaces/innerkits/napi", - "//foundation/ace/napi/interfaces/innerkits", + "//foundation/arkui/napi/interfaces/inner_api/napi", + "//foundation/arkui/napi/interfaces/inner_api", "//third_party/jsframework/runtime/main/extend", "//foundation/windowmanager/interfaces/kits", "//third_party/jsframework/runtime/main/extend/systemplugin", diff --git a/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn b/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn index be87aea19..cb04a36f9 100644 --- a/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcserverlistener_fuzzer/BUILD.gn @@ -25,8 +25,8 @@ ohos_fuzztest("IpcServerListenerFuzzTest") { "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp/include", "//foundation/distributedhardware/devicemanager/interfaces/kits/js/include", "//third_party/node/src", - "//foundation/ace/napi/native_engine", - "//foundation/ace/napi/interfaces/kits", + "//foundation/arkui/napi/native_engine", + "//foundation/arkui/napi/interfaces/kits", "//utils/native/base/include", "//utils/system/safwk/native/include", "${innerkits_path}/native_cpp/include", @@ -71,8 +71,8 @@ ohos_fuzztest("IpcServerListenerFuzzTest") { "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", "//third_party/json/include", "//foundation/appexecfwk/appexecfwk_lite/interfaces/kits/bundle_lite", - "//foundation/ace/napi/interfaces/innerkits/napi", - "//foundation/ace/napi/interfaces/innerkits", + "//foundation/arkui/napi/interfaces/innerkits/napi", + "//foundation/arkui/napi/interfaces/innerkits", "//third_party/jsframework/runtime/main/extend", "//foundation/windowmanager/interfaces/kits", "//third_party/jsframework/runtime/main/extend/systemplugin", diff --git a/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn b/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn index 9ca31aa17..9e1cbb1d5 100644 --- a/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn +++ b/test/fuzztest/ipcserverstub_fuzzer/BUILD.gn @@ -25,8 +25,8 @@ ohos_fuzztest("IpcServerStubFuzzTest") { "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp/include", "//foundation/distributedhardware/devicemanager/interfaces/kits/js/include", "//third_party/node/src", - "//foundation/ace/napi/native_engine", - "//foundation/ace/napi/interfaces/kits", + "//foundation/arkui/napi/native_engine", + "//foundation/arkui/napi/interfaces/kits", "//utils/native/base/include", "//utils/system/safwk/native/include", "${innerkits_path}/native_cpp/include", @@ -71,8 +71,8 @@ ohos_fuzztest("IpcServerStubFuzzTest") { "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", "//third_party/json/include", "//foundation/appexecfwk/appexecfwk_lite/interfaces/kits/bundle_lite", - "//foundation/ace/napi/interfaces/innerkits/napi", - "//foundation/ace/napi/interfaces/innerkits", + "//foundation/arkui/napi/interfaces/inner_api/napi", + "//foundation/arkui/napi/interfaces/inner_api", "//third_party/jsframework/runtime/main/extend", "//foundation/windowmanager/interfaces/kits", "//third_party/jsframework/runtime/main/extend/systemplugin", -- Gitee