From a7d4e37f6a76b0ec0f8e81ce17c3a0bbdb00966b Mon Sep 17 00:00:00 2001 From: zhangxiao72 Date: Thu, 21 Apr 2022 11:24:11 +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: Icfc840b84a0f913d7f826fc2d0e55d573272fb83 Signed-off-by: zhangxiao72 --- js/builtin/CMakeLists.txt | 2 +- js/builtin/common/BUILD.gn | 4 ++-- js/builtin/deviceinfokit/BUILD.gn | 6 +++--- js/builtin/filekit/BUILD.gn | 6 +++--- js/builtin/kvstorekit/BUILD.gn | 6 +++--- js/builtin/simulator/BUILD.gn | 16 ++++++++-------- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/js/builtin/CMakeLists.txt b/js/builtin/CMakeLists.txt index 07c699c..102347b 100644 --- a/js/builtin/CMakeLists.txt +++ b/js/builtin/CMakeLists.txt @@ -19,7 +19,7 @@ set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(JSFWK_INTERFACES_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../foundation/ace/interfaces/innerkits/builtin") +set(JSFWK_INTERFACES_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../foundation/arkui/interfaces/inner_api/builtin") set(PARAM_INTERFACES_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../base/startup/syspara_lite/interfaces/kits") set(PARAM_FRAMEWORKS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../base/startup/syspara_lite/frameworks") set(PARAM_HALS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../base/startup/syspara_lite/hals") diff --git a/js/builtin/common/BUILD.gn b/js/builtin/common/BUILD.gn index 699965e..fb226b9 100644 --- a/js/builtin/common/BUILD.gn +++ b/js/builtin/common/BUILD.gn @@ -26,7 +26,7 @@ lite_library("ace_kit_common") { cflags_cc = cflags include_dirs = [ "include", - "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin", - "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/base", + "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin", + "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/base", ] } diff --git a/js/builtin/deviceinfokit/BUILD.gn b/js/builtin/deviceinfokit/BUILD.gn index 2103dce..8cc25e3 100644 --- a/js/builtin/deviceinfokit/BUILD.gn +++ b/js/builtin/deviceinfokit/BUILD.gn @@ -29,9 +29,9 @@ lite_library("ace_kit_deviceinfo") { "include", "../common/include", "//base/startup/syspara_lite/interfaces/kits", - "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin", - "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/base", - "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/async", + "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin", + "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/base", + "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/async", "//foundation/graphic/ui/interfaces/kits", "//foundation/graphic/utils/interfaces/innerkits", "//foundation/graphic/utils/interfaces/kits", diff --git a/js/builtin/filekit/BUILD.gn b/js/builtin/filekit/BUILD.gn index 9979cef..3aacd05 100644 --- a/js/builtin/filekit/BUILD.gn +++ b/js/builtin/filekit/BUILD.gn @@ -33,9 +33,9 @@ lite_library("ace_kit_file") { "include", "../common/include", "//third_party/bounds_checking_function/include", - "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin", - "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/base", - "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/async", + "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin", + "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/base", + "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/async", "${aafwk_lite_path}/interfaces/kits/ability_lite", ] deps = [ "//third_party/bounds_checking_function:libsec_shared" ] diff --git a/js/builtin/kvstorekit/BUILD.gn b/js/builtin/kvstorekit/BUILD.gn index 65cae60..d4c009f 100644 --- a/js/builtin/kvstorekit/BUILD.gn +++ b/js/builtin/kvstorekit/BUILD.gn @@ -33,9 +33,9 @@ lite_library("ace_kit_kvstore") { "include", "../common/include", "//third_party/bounds_checking_function/include", - "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin", - "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/base", - "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/async", + "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin", + "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/base", + "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/async", "${aafwk_lite_path}/interfaces/kits/ability_lite", ] deps = [ "//third_party/bounds_checking_function:libsec_shared" ] diff --git a/js/builtin/simulator/BUILD.gn b/js/builtin/simulator/BUILD.gn index 85ec260..71e1df8 100644 --- a/js/builtin/simulator/BUILD.gn +++ b/js/builtin/simulator/BUILD.gn @@ -19,8 +19,8 @@ import("//build/ohos.gni") ohos_static_library("ace_kit_common_simulator") { include_dirs = [ "//utils/native/lite/js/builtin/common/include", - "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin", - "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/base", + "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin", + "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/base", ] sources = [ "//utils/native/lite/js/builtin/common/src/nativeapi_common.cpp" ] cflags = [ "-Wall" ] @@ -32,7 +32,7 @@ ohos_static_library("ace_kit_deviceinfo_simulator") { "//utils/native/lite/js/builtin/deviceinfokit/include", "//utils/native/lite/js/builtin/common/include", "//base/startup/syspara_lite/interfaces/kits", - "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin", + "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin", "//base/global/resmgr_lite/interfaces/innerkits/include", ] sources = [ @@ -41,7 +41,7 @@ ohos_static_library("ace_kit_deviceinfo_simulator") { cflags = [ "-Wall" ] cflags_cc = cflags deps = [ - "//foundation/ace/ace_engine_lite/frameworks/targets/simulator:ace_lite", + "//foundation/arkui/ace_engine_lite/frameworks/targets/simulator:ace_lite", "//foundation/graphic/ui/huawei_proprietary/tools/ide:graphic_lite", ] } @@ -69,7 +69,7 @@ ohos_static_library("ace_kit_file_simulator") { "//utils/native/lite/js/builtin/filekit/include", "//utils/native/lite/js/builtin/common/include", "//third_party/bounds_checking_function/include", - "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin", + "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin", "${aafwk_lite_path}/interfaces/kits/ability_lite", ] sources = [ @@ -79,7 +79,7 @@ ohos_static_library("ace_kit_file_simulator") { public_configs = [ ":aafwk_config" ] configs = [ ":storage_config" ] deps = [ - "//foundation/ace/ace_engine_lite/frameworks/targets/simulator:ace_lite", + "//foundation/arkui/ace_engine_lite/frameworks/targets/simulator:ace_lite", ] } @@ -88,7 +88,7 @@ ohos_static_library("ace_kit_kvstore_simulator") { "//utils/native/lite/js/builtin/kvstorekit/include", "//utils/native/lite/js/builtin/common/include", "//third_party/bounds_checking_function/include", - "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin", + "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin", "${aafwk_lite_path}/interfaces/kits/ability_lite", ] sources = [ @@ -98,6 +98,6 @@ ohos_static_library("ace_kit_kvstore_simulator") { public_configs = [ ":aafwk_config" ] configs = [ ":storage_config" ] deps = [ - "//foundation/ace/ace_engine_lite/frameworks/targets/simulator:ace_lite", + "//foundation/arkui/ace_engine_lite/frameworks/targets/simulator:ace_lite", ] } -- GitLab