From 9a345926884bfa02fe29596890ce8f8a20530b8d Mon Sep 17 00:00:00 2001 From: zhangxiao72 Date: Thu, 21 Apr 2022 09:46: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: I268fdcd3476bf9489fbedb3802b9beb224f4fdd2 Signed-off-by: zhangxiao72 --- CMakeLists.txt | 12 ++-- frameworks/js/builtin/BUILD.gn | 67 +++++++++---------- frameworks/js/builtin/CMakeLists.txt | 18 ++--- .../js/builtin/test/include/memory_heap.h | 2 +- frameworks/js/napi/BUILD.gn | 8 +-- test/napi/websocket/unittest/BUILD.gn | 10 +-- 6 files changed, 58 insertions(+), 59 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d79253f6d..574f8b007 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,9 +17,9 @@ project(CommunicationNetStack) set(CMAKE_CXX_STANDARD 23) include_directories( - ../../ace/napi/interfaces/kits - ../../ace/napi/native_engine/impl/quickjs - ../../ace/napi/ + ../../arkui/napi/interfaces/kits + ../../arkui/napi/native_engine/impl/quickjs + ../../arkui/napi/ ../../../third_party/node/src ) @@ -39,8 +39,8 @@ include_directories(../../../base/hiviewdfx/hilog/interfaces/native/innerkits/in include_directories(test/napi/common) -include_directories(../../../foundation/ace/ace_engine/frameworks/base/utils) -include_directories(../../../foundation/ace/napi/interfaces/innerkits) +include_directories(../../../foundation/arkui/ace_engine/frameworks/base/utils) +include_directories(../../../foundation/arkui/napi/interfaces/inner_api) include_directories(../../../for_linux) include_directories(../../../third_party/quickjs) @@ -50,7 +50,7 @@ include_directories(../../../third_party/libuv/include) link_directories(../../../utils/native/base/cmake-build-debug/src/securec) -link_directories(../../../foundation/ace/napi/cmake-build-debug) +link_directories(../../../foundation/arkui/napi/cmake-build-debug) link_directories(../../../third_party/quickjs) diff --git a/frameworks/js/builtin/BUILD.gn b/frameworks/js/builtin/BUILD.gn index e016eb2a0..0eda9e4e9 100644 --- a/frameworks/js/builtin/BUILD.gn +++ b/frameworks/js/builtin/BUILD.gn @@ -15,53 +15,52 @@ import("//build/lite/config/component/lite_component.gni") import("//build/lite/ndk/ndk.gni") http_lite_sources = [ - "fetch_module.cpp", - "http_request/http_request.cpp", - "http_request/http_constant.cpp", - "http_request/http_async_callback.cpp", - "http_request/response_data.cpp", - "http_request/request_data.cpp", - "http_request/http_request_utils.cpp", + "fetch_module.cpp", + "http_request/http_async_callback.cpp", + "http_request/http_constant.cpp", + "http_request/http_request.cpp", + "http_request/http_request_utils.cpp", + "http_request/request_data.cpp", + "http_request/response_data.cpp", ] http_lite_include_dirs = [ - "//foundation/communication/netstack/http_lite/frameworks/js/builtin", + "//foundation/communication/netstack/http_lite/frameworks/js/builtin", - "//third_party/curl/include", - "//third_party/bounds_checking_function/include", + "//third_party/curl/include", + "//third_party/bounds_checking_function/include", - "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/async", - "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/jsi", - "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/base", + "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/async", + "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/jsi", + "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/base", - "//foundation/ace/ace_engine_lite/frameworks/common/utils", - "//foundation/ace/ace_engine_lite/frameworks/common/log", + "//foundation/arkui/ace_engine_lite/frameworks/common/utils", + "//foundation/arkui/ace_engine_lite/frameworks/common/log", - "//base/hiviewdfx/hilog_lite/interfaces/native/kits", - "//foundation/ace/ace_engine_lite/frameworks/targets/liteos_a", + "//base/hiviewdfx/hilog_lite/interfaces/native/kits", + "//foundation/arkui/ace_engine_lite/frameworks/targets/liteos_a", ] config("http_lite_config") { - include_dirs = http_lite_include_dirs - defines = ["NO_SSL_CERTIFICATION=1"] + include_dirs = http_lite_include_dirs + defines = [ "NO_SSL_CERTIFICATION=1" ] } lite_library("http_lite_shared") { - target_type = "shared_library" - sources = http_lite_sources - public_configs = [":http_lite_config"] - output_name = "http_lite" - deps = [ - "//third_party/curl:libcurl_shared", - "//third_party/bounds_checking_function:libsec_shared", - "//foundation/ace/ace_engine_lite/frameworks/common:ace_common_lite", - ] + target_type = "shared_library" + sources = http_lite_sources + public_configs = [ ":http_lite_config" ] + output_name = "http_lite" + deps = [ + "//foundation/arkui/ace_engine_lite/frameworks/common:ace_common_lite", + "//third_party/bounds_checking_function:libsec_shared", + "//third_party/curl:libcurl_shared", + ] } ndk_lib("http_lite_ndk") { - lib_extension = ".so" - deps = [":http_lite_shared"] - head_files = [ - "//foundation/communication/netstack/http_lite/frameworks/js/builtin", - ] -} \ No newline at end of file + lib_extension = ".so" + deps = [ ":http_lite_shared" ] + head_files = + [ "//foundation/communication/netstack/http_lite/frameworks/js/builtin" ] +} diff --git a/frameworks/js/builtin/CMakeLists.txt b/frameworks/js/builtin/CMakeLists.txt index ea24a2718..f271acb4f 100644 --- a/frameworks/js/builtin/CMakeLists.txt +++ b/frameworks/js/builtin/CMakeLists.txt @@ -18,12 +18,12 @@ set(CMAKE_CXX_STANDARD 14) include_directories(test/include) -include_directories(../../../../../ace/ace_engine_lite/interfaces/innerkits/builtin/jsi) -include_directories(../../../../../ace/ace_engine_lite/interfaces/innerkits/builtin/async) +include_directories(../../../../../arkui/ace_engine_lite/interfaces/innerkits/builtin/jsi) +include_directories(../../../../../arkui/ace_engine_lite/interfaces/innerkits/builtin/async) -include_directories(../../../../../ace/ace_engine_lite/frameworks/common/utils) -include_directories(../../../../../ace/ace_engine_lite/frameworks/src/core/context) -include_directories(../../../../../ace/ace_engine_lite/frameworks/targets/simulator) +include_directories(../../../../../arkui/ace_engine_lite/frameworks/common/utils) +include_directories(../../../../../arkui/ace_engine_lite/frameworks/src/core/context) +include_directories(../../../../../arkui/ace_engine_lite/frameworks/targets/simulator) include_directories(../../../../../../third_party/jerryscript/jerry-core/include) include_directories(../../../../../../third_party/jerryscript/jerry-ext/include/jerryscript-ext) @@ -44,10 +44,10 @@ add_library(test_fetch_module http_request/request_data.cpp http_request/http_request_utils.cpp - ../../../../../ace/ace_engine_lite/frameworks/native_engine/jsi/jsi.cpp - ../../../../../ace/ace_engine_lite/frameworks/native_engine/async/js_async_work.cpp - ../../../../../ace/ace_engine_lite/frameworks/native_engine/async/message_queue_utils.cpp - ../../../../../ace/ace_engine_lite/frameworks/common/memory/memory_heap.cpp + ../../../../../arkui/ace_engine_lite/frameworks/native_engine/jsi/jsi.cpp + ../../../../../arkui/ace_engine_lite/frameworks/native_engine/async/js_async_work.cpp + ../../../../../arkui/ace_engine_lite/frameworks/native_engine/async/message_queue_utils.cpp + ../../../../../arkui/ace_engine_lite/frameworks/common/memory/memory_heap.cpp ) target_link_libraries(test_fetch_module jerry-core) diff --git a/frameworks/js/builtin/test/include/memory_heap.h b/frameworks/js/builtin/test/include/memory_heap.h index 9a949dcb4..68ab90e1d 100644 --- a/frameworks/js/builtin/test/include/memory_heap.h +++ b/frameworks/js/builtin/test/include/memory_heap.h @@ -16,6 +16,6 @@ #ifndef TEST_OHOS_ACELITE_MEMORY_HEAP_H #define TEST_OHOS_ACELITE_MEMORY_HEAP_H -#include "../../../../../../../ace/ace_engine_lite/interfaces/innerkits/builtin/base/memory_heap.h" +#include "../../../../../../../arkui/ace_engine_lite/interfaces/innerkits/builtin/base/memory_heap.h" #endif \ No newline at end of file diff --git a/frameworks/js/napi/BUILD.gn b/frameworks/js/napi/BUILD.gn index abc6345e5..fd57efa32 100644 --- a/frameworks/js/napi/BUILD.gn +++ b/frameworks/js/napi/BUILD.gn @@ -36,14 +36,14 @@ utils_include = [ ] common_include = [ - "//foundation/ace/ace_engine/frameworks/base/utils", - "//foundation/ace/napi/interfaces/kits", - "//foundation/ace/napi", + "//foundation/arkui/ace_engine/frameworks/base/utils", + "//foundation/arkui/napi/interfaces/kits", + "//foundation/arkui/napi", "//third_party/node/src", ] common_deps = [ - "//foundation/ace/napi/:ace_napi", + "//foundation/arkui/napi/:ace_napi", "//utils/native/base:utils", ] diff --git a/test/napi/websocket/unittest/BUILD.gn b/test/napi/websocket/unittest/BUILD.gn index aa1c5b7f3..ff5b6364d 100644 --- a/test/napi/websocket/unittest/BUILD.gn +++ b/test/napi/websocket/unittest/BUILD.gn @@ -38,14 +38,14 @@ if ("${product_name}" == "m40") { ] common_include = [ - "//foundation/ace/ace_engine/frameworks/base/utils", - "//foundation/ace/napi/interfaces/kits", - "//foundation/ace/napi", + "//foundation/arkui/ace_engine/frameworks/base/utils", + "//foundation/arkui/napi/interfaces/kits", + "//foundation/arkui/napi", "//third_party/node/src", ] common_deps = [ - "//foundation/ace/napi/:ace_napi", + "//foundation/arkui/napi/:ace_napi", "//utils/native/base:utils", ] @@ -99,7 +99,7 @@ if ("${product_name}" == "m40") { "$NETSTACK_NAPI_ROOT/websocket/websocket_module/include", ] include_dirs += [ - "//foundation/ace/napi/interfaces/innerkits", + "//foundation/arkui/napi/interfaces/inner_api", "//third_party/libuv/include", "//third_party/libwebsockets/include", "//third_party/openssl/include", -- Gitee