From 2da13b5debd01fb4f2599d2dca91ef8bf504bb5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E5=B0=8F=E6=9E=97?= Date: Sun, 25 May 2025 18:10:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E7=8B=AC=E7=AB=8B=E5=8C=96?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E8=B0=83=E6=95=B4=EF=BC=8C=E8=B0=83=E6=95=B4?= =?UTF-8?q?BUILD.gn=E5=92=8Cbundle.json=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E8=B0=83=E6=95=B4=E5=A4=B4=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E5=BC=95=E5=85=A5=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ife1def179f665b472b793170a7bed7422edad66e Signed-off-by: 姜小林 --- bundle.json | 20 ++++++------ file_api.gni | 7 +--- interfaces/kits/c/environment/BUILD.gn | 7 ++-- interfaces/kits/c/environment/environment.c | 4 +-- interfaces/kits/c/fileio/BUILD.gn | 7 ++-- interfaces/kits/c/fileio/fileio.c | 4 +-- interfaces/kits/js/BUILD.gn | 32 +++++++++---------- .../js/src/common/file_helper/fd_guard.cpp | 4 +-- .../src/common/napi/n_async/n_async_context.h | 6 ++-- .../napi/n_async/n_async_work_callback.cpp | 4 +-- .../napi/n_async/n_async_work_promise.cpp | 4 +-- .../kits/js/src/common/napi/n_async/n_ref.h | 4 +-- .../kits/js/src/common/napi/n_class.cpp | 4 +-- interfaces/kits/js/src/common/napi/n_class.h | 7 ++-- .../kits/js/src/common/napi/n_func_arg.cpp | 4 +-- interfaces/kits/js/src/common/napi/n_val.cpp | 6 ++-- .../src/mod_document/document_n_exporter.cpp | 16 +++++----- .../js/src/mod_document/document_n_exporter.h | 4 +-- .../mod_file/class_file/file_n_exporter.cpp | 19 +++++------ .../src/mod_file/class_file/file_n_exporter.h | 4 +-- .../kits/js/src/mod_file/common_func.cpp | 4 +-- interfaces/kits/js/src/mod_file/common_func.h | 4 +-- interfaces/kits/js/src/mod_file/module.cpp | 4 +-- .../mod_fileio/class_constants/constants.cpp | 13 ++++---- .../mod_fileio/class_constants/constants.h | 4 +-- .../mod_fileio/class_dir/dir_n_exporter.cpp | 16 +++++----- .../src/mod_fileio/class_dir/dir_n_exporter.h | 4 +-- .../class_dirent/dirent_n_exporter.cpp | 14 ++++---- .../class_dirent/dirent_n_exporter.h | 4 +-- .../src/mod_fileio/class_file/file_entity.h | 4 +-- .../mod_fileio/class_file/file_n_exporter.cpp | 16 +++++----- .../mod_fileio/class_file/file_n_exporter.h | 4 +-- .../mod_fileio/class_stat/stat_n_exporter.cpp | 14 ++++---- .../mod_fileio/class_stat/stat_n_exporter.h | 4 +-- .../class_stat_v9/stat_n_exporter_v9.cpp | 15 ++++----- .../class_stat_v9/stat_n_exporter_v9.h | 4 +-- .../js/src/mod_fileio/class_stream/flush.cpp | 19 ++++++----- .../js/src/mod_fileio/class_stream/flush.h | 4 +-- .../class_stream/stream_n_exporter.cpp | 18 +++++------ .../class_stream/stream_n_exporter.h | 4 +-- .../mod_fileio/class_watcher/watcher_entity.h | 4 +-- .../class_watcher/watcher_n_exporter.cpp | 14 ++++---- .../class_watcher/watcher_n_exporter.h | 4 +-- .../kits/js/src/mod_fileio/common_func.cpp | 15 +++++---- .../kits/js/src/mod_fileio/common_func.h | 4 +-- interfaces/kits/js/src/mod_fileio/module.cpp | 4 +-- .../kits/js/src/mod_fileio/module_v9.cpp | 4 +-- .../js/src/mod_fileio/properties/chmod.cpp | 11 ++++--- .../kits/js/src/mod_fileio/properties/chmod.h | 4 +-- .../js/src/mod_fileio/properties/chown.cpp | 8 ++--- .../kits/js/src/mod_fileio/properties/chown.h | 4 +-- .../js/src/mod_fileio/properties/close.cpp | 9 +++--- .../kits/js/src/mod_fileio/properties/close.h | 4 +-- .../src/mod_fileio/properties/copy_file.cpp | 15 +++++---- .../js/src/mod_fileio/properties/copy_file.h | 4 +-- .../mod_fileio/properties/create_stream.cpp | 19 ++++++----- .../src/mod_fileio/properties/create_stream.h | 4 +-- .../js/src/mod_fileio/properties/fchmod.cpp | 12 ++++--- .../js/src/mod_fileio/properties/fchmod.h | 4 +-- .../js/src/mod_fileio/properties/fchown.cpp | 9 +++--- .../js/src/mod_fileio/properties/fchown.h | 4 +-- .../src/mod_fileio/properties/fdatasync.cpp | 13 +++++--- .../js/src/mod_fileio/properties/fdatasync.h | 4 +-- .../mod_fileio/properties/fdopen_stream.cpp | 19 +++++------ .../src/mod_fileio/properties/fdopen_stream.h | 4 +-- .../js/src/mod_fileio/properties/fstat.cpp | 19 ++++++----- .../kits/js/src/mod_fileio/properties/fstat.h | 4 +-- .../js/src/mod_fileio/properties/fsync.cpp | 8 ++--- .../kits/js/src/mod_fileio/properties/fsync.h | 4 +-- .../src/mod_fileio/properties/ftruncate.cpp | 8 ++--- .../js/src/mod_fileio/properties/ftruncate.h | 4 +-- .../js/src/mod_fileio/properties/hash.cpp | 4 +-- .../kits/js/src/mod_fileio/properties/hash.h | 10 +++--- .../js/src/mod_fileio/properties/lchown.cpp | 9 +++--- .../js/src/mod_fileio/properties/lchown.h | 4 +-- .../js/src/mod_fileio/properties/link.cpp | 8 ++--- .../kits/js/src/mod_fileio/properties/link.h | 4 +-- .../js/src/mod_fileio/properties/lseek.cpp | 10 +++--- .../kits/js/src/mod_fileio/properties/lseek.h | 4 +-- .../js/src/mod_fileio/properties/lstat.cpp | 19 ++++++----- .../kits/js/src/mod_fileio/properties/lstat.h | 4 +-- .../js/src/mod_fileio/properties/mkdtemp.cpp | 9 +++--- .../js/src/mod_fileio/properties/mkdtemp.h | 4 +-- .../js/src/mod_fileio/properties/open.cpp | 13 ++++---- .../kits/js/src/mod_fileio/properties/open.h | 4 +-- .../js/src/mod_fileio/properties/open_dir.cpp | 19 +++++------ .../js/src/mod_fileio/properties/open_dir.h | 4 +-- .../js/src/mod_fileio/properties/open_v9.h | 4 +-- .../mod_fileio/properties/posix_fallocate.cpp | 9 +++--- .../mod_fileio/properties/posix_fallocate.h | 4 +-- .../mod_fileio/properties/prop_n_exporter.cpp | 6 ++-- .../mod_fileio/properties/prop_n_exporter.h | 10 +++--- .../js/src/mod_fileio/properties/read_dir.cpp | 14 ++++---- .../js/src/mod_fileio/properties/read_dir.h | 4 +-- .../src/mod_fileio/properties/read_text.cpp | 16 ++++++---- .../js/src/mod_fileio/properties/read_text.h | 8 ++--- .../js/src/mod_fileio/properties/rename.cpp | 8 ++--- .../js/src/mod_fileio/properties/rename.h | 5 +-- .../js/src/mod_fileio/properties/rmdir.cpp | 10 +++--- .../kits/js/src/mod_fileio/properties/rmdir.h | 4 +-- .../js/src/mod_fileio/properties/rmdirent.cpp | 13 ++++---- .../js/src/mod_fileio/properties/rmdirent.h | 4 +-- .../js/src/mod_fileio/properties/stat.cpp | 19 ++++++----- .../kits/js/src/mod_fileio/properties/stat.h | 4 +-- .../js/src/mod_fileio/properties/stat_v9.cpp | 21 ++++++------ .../js/src/mod_fileio/properties/stat_v9.h | 4 +-- .../js/src/mod_fileio/properties/symlink.cpp | 10 +++--- .../js/src/mod_fileio/properties/symlink.h | 4 +-- .../js/src/mod_fileio/properties/truncate.h | 10 +++--- .../src/mod_fileio/properties/truncate_v9.cpp | 4 +-- .../src/mod_fileio/properties/truncate_v9.h | 10 +++--- .../js/src/mod_fileio/properties/watcher.cpp | 16 +++++----- .../js/src/mod_fileio/properties/watcher.h | 4 +-- .../src/mod_fs/class_file/file_n_exporter.cpp | 10 +++--- .../randomaccessfile_n_exporter.cpp | 4 +-- .../class_watcher/watcher_n_exporter.cpp | 6 ++-- .../kits/js/src/mod_fs/properties/watcher.cpp | 7 ++-- interfaces/kits/native/BUILD.gn | 3 +- interfaces/kits/rust/BUILD.gn | 8 +++-- interfaces/kits/ts/gen_obj.gni | 13 ++++---- interfaces/kits/ts/streamhash/BUILD.gn | 6 ++-- interfaces/kits/ts/streamrw/BUILD.gn | 6 ++-- interfaces/test/unittest/class_file/BUILD.gn | 9 +++--- .../test/unittest/filemgmt_libn_test/BUILD.gn | 4 +-- interfaces/test/unittest/remote_uri/BUILD.gn | 8 ++--- interfaces/test/unittest/task_signal/BUILD.gn | 4 +-- 126 files changed, 527 insertions(+), 502 deletions(-) diff --git a/bundle.json b/bundle.json index d2f531cf4..2edbfd663 100644 --- a/bundle.json +++ b/bundle.json @@ -31,28 +31,30 @@ "ability_base", "ability_runtime", "access_token", + "app_file_service", "bounds_checking_function", "bundle_framework", - "common_event_service", "c_utils", + "common_event_service", "data_share", "dfs_service", "eventhandler", + "googletest", "hilog", "hisysevent", "hitrace", - "ipc", "init", + "ipc", + "liburing", + "libuv", "napi", - "samgr", - "app_file_service", + "node", + "openssl", "os_account", - "liburing" + "rust_libc", + "samgr" ], - "third_party": [ - "e2fsprogs", - "openssl" - ] + "third_party": [] }, "build": { "group_type": { diff --git a/file_api.gni b/file_api.gni index 9e0d34395..518d718c8 100644 --- a/file_api.gni +++ b/file_api.gni @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -11,12 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -aafwk_kits_path = "//foundation/ability/ability_runtime/frameworks/native" -aafwk_path = "${aafwk_kits_path}/frameworks/kits" -arkui_napi_path = "//foundation/arkui/napi" file_api_path = "//foundation/filemanagement/file_api" -filemanagement_service_path = "//foundation/filemanagement/dfs_service/services" -hiviewdfx_hilog_path = "//base/hiviewdfx/hilog" src_path = "${file_api_path}/interfaces/kits/js/src" utils_path = "${file_api_path}/utils" diff --git a/interfaces/kits/c/environment/BUILD.gn b/interfaces/kits/c/environment/BUILD.gn index 2e3ce4ccb..758b5c01e 100644 --- a/interfaces/kits/c/environment/BUILD.gn +++ b/interfaces/kits/c/environment/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2024 Huawei Device Co., Ltd. +# Copyright (C) 2024-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -33,7 +33,10 @@ ohos_shared_library("ohenvironment") { cfi_cross_dso = true debug = false } - include_dirs = [ "./" ] + include_dirs = [ + "./", + "../common/", + ] sources = [ "./environment.c" ] deps = [ "${file_api_path}/interfaces/kits/native:environment_native" ] diff --git a/interfaces/kits/c/environment/environment.c b/interfaces/kits/c/environment/environment.c index c7a6d2e96..509e94518 100644 --- a/interfaces/kits/c/environment/environment.c +++ b/interfaces/kits/c/environment/environment.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2024-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -18,7 +18,7 @@ #include #include "environment_native.h" -#include "../common/error_code.h" +#include "error_code.h" int OH_Environment_GetUserDownloadDir(char **result) { diff --git a/interfaces/kits/c/fileio/BUILD.gn b/interfaces/kits/c/fileio/BUILD.gn index 716f9e7c3..5a98cb0d1 100644 --- a/interfaces/kits/c/fileio/BUILD.gn +++ b/interfaces/kits/c/fileio/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2024 Huawei Device Co., Ltd. +# Copyright (C) 2024-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -34,7 +34,10 @@ ohos_shared_library("ohfileio") { "-fvisibility-inlines-hidden", "-Oz", ] - include_dirs = [ "./" ] + include_dirs = [ + "./", + "../common/", + ] sources = [ "./fileio.c" ] deps = [ "${file_api_path}/interfaces/kits/native:fileio_native" ] diff --git a/interfaces/kits/c/fileio/fileio.c b/interfaces/kits/c/fileio/fileio.c index 4004cf646..71904b4af 100644 --- a/interfaces/kits/c/fileio/fileio.c +++ b/interfaces/kits/c/fileio/fileio.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2024-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,8 +16,8 @@ #include +#include "error_code.h" #include "fileio_native.h" -#include "../common/error_code.h" __attribute__((visibility("default"))) int OH_FileIO_GetFileLocation(char *uri, int uriLength, int *location) { diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn index 9fc445f9a..1fad4e0e9 100644 --- a/interfaces/kits/js/BUILD.gn +++ b/interfaces/kits/js/BUILD.gn @@ -58,13 +58,11 @@ ohos_shared_library("fileio") { relative_install_dir = "module" include_dirs = [ - "${arkui_napi_path}/interfaces/kits", + "src/common", "src/common/file_helper", "src/common/napi", "src/common/napi/n_async", - "//third_party/node/src", - "//third_party/libuv/include", - "//third_party/openssl/include", + "src/mod_fileio", "${utils_path}/common/include", ] @@ -116,7 +114,6 @@ ohos_shared_library("fileio") { deps = [ "${file_api_path}/interfaces/kits/native:remote_uri_native", "${utils_path}/filemgmt_libhilog:filemgmt_libhilog", - "//third_party/openssl:libcrypto_shared", ] use_exceptions = true @@ -124,8 +121,12 @@ ohos_shared_library("fileio") { external_deps = [ "ability_base:zuri", "bounds_checking_function:libsec_shared", + "c_utils:utils", "hilog:libhilog", + "libuv:uv", "napi:ace_napi", + "node:node_header_notice", + "openssl:libcrypto_shared", ] defines = [ "OPENSSL_SUPPRESS_DEPRECATED" ] } @@ -137,14 +138,12 @@ ohos_shared_library("fs") { relative_install_dir = "module/file" include_dirs = [ - "${filemanagement_service_path}/distributedfiledaemon/include/ipc", "${src_path}/common", "${src_path}/common/file_helper", "${src_path}/mod_fs", "${src_path}/mod_fs/properties", "${src_path}/mod_fs/properties/copy_listener", "${utils_path}/common/include", - "//third_party/libuv/include", ] sources = [ @@ -210,10 +209,7 @@ ohos_shared_library("fs") { debug = false } - include_dirs += [ - "${file_api_path}/interfaces/kits/rust/include", - "${filemanagement_service_path}/distributedfiledaemon/include/ipc", - ] + include_dirs += [ "${file_api_path}/interfaces/kits/rust/include" ] sources += [ "src/mod_fs/class_atomicfile/atomicfile_n_exporter.cpp", "src/mod_fs/class_randomaccessfile/randomaccessfile_n_exporter.cpp", @@ -261,6 +257,7 @@ ohos_shared_library("fs") { "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", + "libuv:uv", "samgr:samgr_proxy", ] deps += [ @@ -298,6 +295,7 @@ ohos_shared_library("hash") { relative_install_dir = "module/file" include_dirs = [ + "${src_path}/common", "${src_path}/common/file_helper", "${src_path}/mod_hash", "${src_path}/mod_hash/class_hashstream", @@ -315,13 +313,13 @@ ohos_shared_library("hash") { deps = [ "${utils_path}/filemgmt_libhilog:filemgmt_libhilog", "${utils_path}/filemgmt_libn:filemgmt_libn", - "//third_party/openssl:libcrypto_shared", ] external_deps = [ "bounds_checking_function:libsec_shared", "hilog:libhilog", "napi:ace_napi", + "openssl:libcrypto_shared", ] defines = [ "OPENSSL_SUPPRESS_DEPRECATED" ] } @@ -353,11 +351,11 @@ ohos_shared_library("file") { relative_install_dir = "module" include_dirs = [ - "${arkui_napi_path}/interfaces/kits", + "src/common", "src/common/napi", "src/common/napi/n_async", "src/common/file_helper", - "//third_party/node/src", + "src/mod_file", ] sources = file_common_src @@ -376,6 +374,7 @@ ohos_shared_library("file") { "eventhandler:libeventhandler", "hilog:libhilog", "napi:ace_napi", + "node:node_header_notice", ] if (file_api_read_optimize) { @@ -588,9 +587,9 @@ ohos_shared_library("document") { relative_install_dir = "module" include_dirs = [ - "${arkui_napi_path}/interfaces/kits", + "src/common", + "src/common/napi", "src/common/napi/n_async", - "//third_party/node/src", ] sources = [ @@ -607,6 +606,7 @@ ohos_shared_library("document") { external_deps = [ "hilog:libhilog", "napi:ace_napi", + "node:node_header_notice", ] } diff --git a/interfaces/kits/js/src/common/file_helper/fd_guard.cpp b/interfaces/kits/js/src/common/file_helper/fd_guard.cpp index 6959b45a5..6ca489d3f 100644 --- a/interfaces/kits/js/src/common/file_helper/fd_guard.cpp +++ b/interfaces/kits/js/src/common/file_helper/fd_guard.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,7 +17,7 @@ #include -#include "../log.h" +#include "log.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/common/napi/n_async/n_async_context.h b/interfaces/kits/js/src/common/napi/n_async/n_async_context.h index 87339bbdd..0daf0d971 100644 --- a/interfaces/kits/js/src/common/napi/n_async/n_async_context.h +++ b/interfaces/kits/js/src/common/napi/n_async/n_async_context.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,9 +16,9 @@ #ifndef N_ASYNC_CONTEXT_H #define N_ASYNC_CONTEXT_H -#include "../../uni_error.h" -#include "../n_val.h" #include "n_ref.h" +#include "n_val.h" +#include "uni_error.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/common/napi/n_async/n_async_work_callback.cpp b/interfaces/kits/js/src/common/napi/n_async/n_async_work_callback.cpp index 75136db63..c85f92450 100644 --- a/interfaces/kits/js/src/common/napi/n_async/n_async_work_callback.cpp +++ b/interfaces/kits/js/src/common/napi/n_async/n_async_work_callback.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,7 +14,7 @@ */ #include "n_async_work_callback.h" -#include "../../log.h" +#include "log.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/common/napi/n_async/n_async_work_promise.cpp b/interfaces/kits/js/src/common/napi/n_async/n_async_work_promise.cpp index 1ba6a0fdb..85883021c 100644 --- a/interfaces/kits/js/src/common/napi/n_async/n_async_work_promise.cpp +++ b/interfaces/kits/js/src/common/napi/n_async/n_async_work_promise.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,7 +14,7 @@ */ #include "n_async_work_promise.h" -#include "../../log.h" +#include "log.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/common/napi/n_async/n_ref.h b/interfaces/kits/js/src/common/napi/n_async/n_ref.h index a9f166cfc..e66ef7850 100644 --- a/interfaces/kits/js/src/common/napi/n_async/n_ref.h +++ b/interfaces/kits/js/src/common/napi/n_async/n_ref.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef N_REF_H #define N_REF_H -#include "../n_val.h" +#include "n_val.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/common/napi/n_class.cpp b/interfaces/kits/js/src/common/napi/n_class.cpp index 191fefc0d..8e4c08d28 100644 --- a/interfaces/kits/js/src/common/napi/n_class.cpp +++ b/interfaces/kits/js/src/common/napi/n_class.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -18,7 +18,7 @@ #include #include -#include "../log.h" +#include "log.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/common/napi/n_class.h b/interfaces/kits/js/src/common/napi/n_class.h index 171b7f627..9296468bd 100644 --- a/interfaces/kits/js/src/common/napi/n_class.h +++ b/interfaces/kits/js/src/common/napi/n_class.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,11 +16,10 @@ #ifndef INTERFACES_KITS_JS_SRC_COMMON_NAPI_N_CLASS_H #define INTERFACES_KITS_JS_SRC_COMMON_NAPI_N_CLASS_H -#include "uni_header.h" - #include -#include "../log.h" +#include "log.h" +#include "uni_header.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/common/napi/n_func_arg.cpp b/interfaces/kits/js/src/common/napi/n_func_arg.cpp index aa2cc60c7..ab80b1c59 100644 --- a/interfaces/kits/js/src/common/napi/n_func_arg.cpp +++ b/interfaces/kits/js/src/common/napi/n_func_arg.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,7 +15,7 @@ #include "n_func_arg.h" -#include "../log.h" +#include "log.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/common/napi/n_val.cpp b/interfaces/kits/js/src/common/napi/n_val.cpp index a0b7fe6e0..2f7399319 100644 --- a/interfaces/kits/js/src/common/napi/n_val.cpp +++ b/interfaces/kits/js/src/common/napi/n_val.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,8 +17,8 @@ #include -#include "../log.h" -#include "../uni_error.h" +#include "log.h" +#include "uni_error.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_document/document_n_exporter.cpp b/interfaces/kits/js/src/mod_document/document_n_exporter.cpp index a23741bc7..d2eb2d14a 100644 --- a/interfaces/kits/js/src/mod_document/document_n_exporter.cpp +++ b/interfaces/kits/js/src/mod_document/document_n_exporter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,15 +15,15 @@ #include "document_n_exporter.h" -#include #include +#include -#include "../common/napi/n_async/n_async_work_callback.h" -#include "../common/napi/n_async/n_async_work_promise.h" -#include "../common/napi/n_class.h" -#include "../common/napi/n_func_arg.h" -#include "../common/napi/n_val.h" -#include "../common/uni_error.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_class.h" +#include "n_func_arg.h" +#include "n_val.h" +#include "uni_error.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_document/document_n_exporter.h b/interfaces/kits/js/src/mod_document/document_n_exporter.h index 653e1e6c7..10bd38010 100644 --- a/interfaces/kits/js/src/mod_document/document_n_exporter.h +++ b/interfaces/kits/js/src/mod_document/document_n_exporter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef DOCUMENT_N_EXPORTER_H #define DOCUMENT_N_EXPORTER_H -#include "../common/napi/n_exporter.h" +#include "n_exporter.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_file/class_file/file_n_exporter.cpp b/interfaces/kits/js/src/mod_file/class_file/file_n_exporter.cpp index 01f591e74..46fdb198e 100644 --- a/interfaces/kits/js/src/mod_file/class_file/file_n_exporter.cpp +++ b/interfaces/kits/js/src/mod_file/class_file/file_n_exporter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -26,17 +26,18 @@ #include #include #include +#include + #include #include -#include -#include "../../common/ability_helper.h" -#include "../../common/file_helper/fd_guard.h" -#include "../../common/napi/n_class.h" -#include "../../common/napi/n_func_arg.h" -#include "../../common/napi/n_val.h" -#include "../../common/uni_error.h" -#include "../common_func.h" +#include "ability_helper.h" +#include "common_func.h" +#include "fd_guard.h" +#include "n_class.h" +#include "n_func_arg.h" +#include "n_val.h" +#include "uni_error.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_file/class_file/file_n_exporter.h b/interfaces/kits/js/src/mod_file/class_file/file_n_exporter.h index f39a8069e..dc5434cd9 100644 --- a/interfaces/kits/js/src/mod_file/class_file/file_n_exporter.h +++ b/interfaces/kits/js/src/mod_file/class_file/file_n_exporter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILE_CLASS_FILE_FILE_N_EXPORTER_H #define INTERFACES_KITS_JS_SRC_MOD_FILE_CLASS_FILE_FILE_N_EXPORTER_H -#include "../../common/napi/n_exporter.h" +#include "n_exporter.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_file/common_func.cpp b/interfaces/kits/js/src/mod_file/common_func.cpp index 4a9fa3d39..73f52d935 100644 --- a/interfaces/kits/js/src/mod_file/common_func.cpp +++ b/interfaces/kits/js/src/mod_file/common_func.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,7 +15,7 @@ #include "common_func.h" -#include "../common/napi/n_func_arg.h" +#include "n_func_arg.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_file/common_func.h b/interfaces/kits/js/src/mod_file/common_func.h index 207411602..85ac91725 100644 --- a/interfaces/kits/js/src/mod_file/common_func.h +++ b/interfaces/kits/js/src/mod_file/common_func.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILE_COMMON_FUNC_H #define INTERFACES_KITS_JS_SRC_MOD_FILE_COMMON_FUNC_H -#include "../common/napi/n_val.h" +#include "n_val.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_file/module.cpp b/interfaces/kits/js/src/mod_file/module.cpp index b4588cf45..1aba9024b 100644 --- a/interfaces/kits/js/src/mod_file/module.cpp +++ b/interfaces/kits/js/src/mod_file/module.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,8 +16,8 @@ #include #include -#include "../common/log.h" #include "class_file/file_n_exporter.h" +#include "log.h" using namespace std; diff --git a/interfaces/kits/js/src/mod_fileio/class_constants/constants.cpp b/interfaces/kits/js/src/mod_fileio/class_constants/constants.cpp index f046d8e84..c557acfe3 100644 --- a/interfaces/kits/js/src/mod_fileio/class_constants/constants.cpp +++ b/interfaces/kits/js/src/mod_fileio/class_constants/constants.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -21,14 +21,15 @@ #include #include #include -#include #include +#include + +#include "log.h" +#include "n_class.h" +#include "n_func_arg.h" #include "securec.h" -#include "../../common/log.h" -#include "../../common/napi/n_class.h" -#include "../../common/napi/n_func_arg.h" -#include "../../common/uni_error.h" +#include "uni_error.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/class_constants/constants.h b/interfaces/kits/js/src/mod_fileio/class_constants/constants.h index 59da2b0bf..f42aacf73 100644 --- a/interfaces/kits/js/src/mod_fileio/class_constants/constants.h +++ b/interfaces/kits/js/src/mod_fileio/class_constants/constants.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_CLASS_CONSTANTS_CONSTANTS_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_CLASS_CONSTANTS_CONSTANTS_H -#include "../../common/napi/n_exporter.h" +#include "n_exporter.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/class_dir/dir_n_exporter.cpp b/interfaces/kits/js/src/mod_fileio/class_dir/dir_n_exporter.cpp index ae1339bd5..d1c4b319e 100644 --- a/interfaces/kits/js/src/mod_fileio/class_dir/dir_n_exporter.cpp +++ b/interfaces/kits/js/src/mod_fileio/class_dir/dir_n_exporter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -21,15 +21,15 @@ #include #include +#include "class_dirent/dirent_entity.h" +#include "class_dirent/dirent_n_exporter.h" +#include "common_func.h" #include "dir_entity.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_class.h" +#include "n_func_arg.h" #include "securec.h" -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_class.h" -#include "../../common/napi/n_func_arg.h" -#include "../class_dirent/dirent_entity.h" -#include "../class_dirent/dirent_n_exporter.h" -#include "../common_func.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/class_dir/dir_n_exporter.h b/interfaces/kits/js/src/mod_fileio/class_dir/dir_n_exporter.h index a40ed03d2..0ecc22ee9 100644 --- a/interfaces/kits/js/src/mod_fileio/class_dir/dir_n_exporter.h +++ b/interfaces/kits/js/src/mod_fileio/class_dir/dir_n_exporter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -18,7 +18,7 @@ #include -#include "../../common/napi/n_exporter.h" +#include "n_exporter.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/class_dirent/dirent_n_exporter.cpp b/interfaces/kits/js/src/mod_fileio/class_dirent/dirent_n_exporter.cpp index 29b78ca89..745ade32b 100644 --- a/interfaces/kits/js/src/mod_fileio/class_dirent/dirent_n_exporter.cpp +++ b/interfaces/kits/js/src/mod_fileio/class_dirent/dirent_n_exporter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -21,13 +21,13 @@ #include #include -#include "securec.h" -#include "../../common/log.h" -#include "../../common/napi/n_class.h" -#include "../../common/napi/n_func_arg.h" -#include "../../common/uni_error.h" -#include "../common_func.h" +#include "common_func.h" #include "dirent_entity.h" +#include "log.h" +#include "n_class.h" +#include "n_func_arg.h" +#include "securec.h" +#include "uni_error.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/class_dirent/dirent_n_exporter.h b/interfaces/kits/js/src/mod_fileio/class_dirent/dirent_n_exporter.h index 0f60629e0..0584f2a5b 100644 --- a/interfaces/kits/js/src/mod_fileio/class_dirent/dirent_n_exporter.h +++ b/interfaces/kits/js/src/mod_fileio/class_dirent/dirent_n_exporter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_CLASS_DIRENT_DIRENT_N_EXPORTER_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_CLASS_DIRENT_DIRENT_N_EXPORTER_H -#include "../../common/napi/n_exporter.h" +#include "n_exporter.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/class_file/file_entity.h b/interfaces/kits/js/src/mod_fileio/class_file/file_entity.h index 9a82a6f79..8737c5d10 100644 --- a/interfaces/kits/js/src/mod_fileio/class_file/file_entity.h +++ b/interfaces/kits/js/src/mod_fileio/class_file/file_entity.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -18,7 +18,7 @@ #include -#include "../../common/file_helper/fd_guard.h" +#include "file_helper/fd_guard.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/class_file/file_n_exporter.cpp b/interfaces/kits/js/src/mod_fileio/class_file/file_n_exporter.cpp index 4eeb63358..7946542fd 100644 --- a/interfaces/kits/js/src/mod_fileio/class_file/file_n_exporter.cpp +++ b/interfaces/kits/js/src/mod_fileio/class_file/file_n_exporter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -20,14 +20,14 @@ #include #include -#include "../../common/log.h" -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_class.h" -#include "../../common/napi/n_func_arg.h" -#include "../../common/uni_error.h" -#include "../common_func.h" +#include "common_func.h" #include "file_entity.h" +#include "log.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_class.h" +#include "n_func_arg.h" +#include "uni_error.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/class_file/file_n_exporter.h b/interfaces/kits/js/src/mod_fileio/class_file/file_n_exporter.h index c77716e61..4a7b85a2b 100644 --- a/interfaces/kits/js/src/mod_fileio/class_file/file_n_exporter.h +++ b/interfaces/kits/js/src/mod_fileio/class_file/file_n_exporter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_CLASS_FILE_FILE_N_EXPORTER_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_CLASS_FILE_FILE_N_EXPORTER_H -#include "../../common/napi/n_exporter.h" +#include "n_exporter.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/class_stat/stat_n_exporter.cpp b/interfaces/kits/js/src/mod_fileio/class_stat/stat_n_exporter.cpp index 40c0ca18f..b80b1bd47 100644 --- a/interfaces/kits/js/src/mod_fileio/class_stat/stat_n_exporter.cpp +++ b/interfaces/kits/js/src/mod_fileio/class_stat/stat_n_exporter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -21,14 +21,14 @@ #include #include +#include "log.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_class.h" +#include "n_func_arg.h" #include "securec.h" -#include "../../common/log.h" -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_class.h" -#include "../../common/napi/n_func_arg.h" -#include "../../common/uni_error.h" #include "stat_entity.h" +#include "uni_error.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/class_stat/stat_n_exporter.h b/interfaces/kits/js/src/mod_fileio/class_stat/stat_n_exporter.h index 430485664..966df112b 100644 --- a/interfaces/kits/js/src/mod_fileio/class_stat/stat_n_exporter.h +++ b/interfaces/kits/js/src/mod_fileio/class_stat/stat_n_exporter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_CLASS_STAT_N_EXPORTER_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_CLASS_STAT_N_EXPORTER_H -#include "../../common/napi/n_exporter.h" +#include "n_exporter.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/class_stat_v9/stat_n_exporter_v9.cpp b/interfaces/kits/js/src/mod_fileio/class_stat_v9/stat_n_exporter_v9.cpp index fb2768f69..856cc3ee9 100644 --- a/interfaces/kits/js/src/mod_fileio/class_stat_v9/stat_n_exporter_v9.cpp +++ b/interfaces/kits/js/src/mod_fileio/class_stat_v9/stat_n_exporter_v9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,8 +14,6 @@ */ #include "stat_n_exporter_v9.h" -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" #include #include @@ -23,13 +21,14 @@ #include #include +#include "log.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_class.h" +#include "n_func_arg.h" #include "securec.h" - -#include "../../common/log.h" -#include "../../common/napi/n_class.h" -#include "../../common/napi/n_func_arg.h" -#include "../../common/uni_error.h" #include "stat_entity_v9.h" +#include "uni_error.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/class_stat_v9/stat_n_exporter_v9.h b/interfaces/kits/js/src/mod_fileio/class_stat_v9/stat_n_exporter_v9.h index c686e3d86..4b7d74087 100644 --- a/interfaces/kits/js/src/mod_fileio/class_stat_v9/stat_n_exporter_v9.h +++ b/interfaces/kits/js/src/mod_fileio/class_stat_v9/stat_n_exporter_v9.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_CLASS_STAT_N_EXPORTER_V9_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_CLASS_STAT_N_EXPORTER_V9_H -#include "../../common/napi/n_exporter.h" +#include "n_exporter.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/class_stream/flush.cpp b/interfaces/kits/js/src/mod_fileio/class_stream/flush.cpp index 590b47e95..13bbe13c9 100644 --- a/interfaces/kits/js/src/mod_fileio/class_stream/flush.cpp +++ b/interfaces/kits/js/src/mod_fileio/class_stream/flush.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,15 +17,14 @@ #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_class.h" -#include "../../common/napi/n_func_arg.h" -#include "../../common/napi/n_val.h" -#include "../../common/uni_error.h" - -#include "../class_stat/stat_entity.h" -#include "../class_stat/stat_n_exporter.h" +#include "class_stat/stat_entity.h" +#include "class_stat/stat_n_exporter.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_class.h" +#include "n_func_arg.h" +#include "n_val.h" +#include "uni_error.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/class_stream/flush.h b/interfaces/kits/js/src/mod_fileio/class_stream/flush.h index c616571b3..969a29c8d 100644 --- a/interfaces/kits/js/src/mod_fileio/class_stream/flush.h +++ b/interfaces/kits/js/src/mod_fileio/class_stream/flush.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_CLASS_STREAM_FLUSH_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_CLASS_STREAM_FLUSH_H -#include "../../common/napi/uni_header.h" +#include "uni_header.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/class_stream/stream_n_exporter.cpp b/interfaces/kits/js/src/mod_fileio/class_stream/stream_n_exporter.cpp index 611dcfc3d..b27d6a71e 100644 --- a/interfaces/kits/js/src/mod_fileio/class_stream/stream_n_exporter.cpp +++ b/interfaces/kits/js/src/mod_fileio/class_stream/stream_n_exporter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -21,17 +21,17 @@ #include #include #include + +#include "common_func.h" #include "flush.h" +#include "log.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_class.h" +#include "n_func_arg.h" #include "securec.h" - -#include "../../common/log.h" -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_class.h" -#include "../../common/napi/n_func_arg.h" -#include "../../common/uni_error.h" -#include "../common_func.h" #include "stream_entity.h" +#include "uni_error.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/class_stream/stream_n_exporter.h b/interfaces/kits/js/src/mod_fileio/class_stream/stream_n_exporter.h index 3cfe4d2d2..4f00cd6d5 100644 --- a/interfaces/kits/js/src/mod_fileio/class_stream/stream_n_exporter.h +++ b/interfaces/kits/js/src/mod_fileio/class_stream/stream_n_exporter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_CLASS_STREAM_STREAM_N_EXPORTER_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_CLASS_STREAM_STREAM_N_EXPORTER_H -#include "../../common/napi/n_exporter.h" +#include "n_exporter.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/class_watcher/watcher_entity.h b/interfaces/kits/js/src/mod_fileio/class_watcher/watcher_entity.h index ce604ee6b..716c66b68 100644 --- a/interfaces/kits/js/src/mod_fileio/class_watcher/watcher_entity.h +++ b/interfaces/kits/js/src/mod_fileio/class_watcher/watcher_entity.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -18,7 +18,7 @@ #include -#include "../../common/napi/uni_header.h" +#include "uni_header.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/class_watcher/watcher_n_exporter.cpp b/interfaces/kits/js/src/mod_fileio/class_watcher/watcher_n_exporter.cpp index 2947b10cb..360d1574a 100644 --- a/interfaces/kits/js/src/mod_fileio/class_watcher/watcher_n_exporter.cpp +++ b/interfaces/kits/js/src/mod_fileio/class_watcher/watcher_n_exporter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -20,13 +20,13 @@ #include #include -#include "../../common/log.h" -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_class.h" -#include "../../common/napi/n_func_arg.h" -#include "../../common/uni_error.h" +#include "log.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_class.h" +#include "n_func_arg.h" #include "securec.h" +#include "uni_error.h" #include "watcher_entity.h" namespace OHOS { diff --git a/interfaces/kits/js/src/mod_fileio/class_watcher/watcher_n_exporter.h b/interfaces/kits/js/src/mod_fileio/class_watcher/watcher_n_exporter.h index 3d3502b7b..13c648ef7 100644 --- a/interfaces/kits/js/src/mod_fileio/class_watcher/watcher_n_exporter.h +++ b/interfaces/kits/js/src/mod_fileio/class_watcher/watcher_n_exporter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_CLASS_WATCHER_WATCHER_N_EXPORTER_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_CLASS_WATCHER_WATCHER_N_EXPORTER_H -#include "../../common/napi/n_exporter.h" +#include "n_exporter.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/common_func.cpp b/interfaces/kits/js/src/mod_fileio/common_func.cpp index b29b270eb..8df8b02dd 100644 --- a/interfaces/kits/js/src/mod_fileio/common_func.cpp +++ b/interfaces/kits/js/src/mod_fileio/common_func.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,15 +17,16 @@ #include #include +#include + #include #include -#include -#include "../common/log.h" -#include "../common/napi/n_class.h" -#include "../common/napi/n_func_arg.h" -#include "../common/napi/n_val.h" -#include "../common/uni_error.h" +#include "log.h" +#include "n_class.h" +#include "n_func_arg.h" +#include "n_val.h" +#include "uni_error.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/common_func.h b/interfaces/kits/js/src/mod_fileio/common_func.h index b76ad5469..37ee34cc5 100644 --- a/interfaces/kits/js/src/mod_fileio/common_func.h +++ b/interfaces/kits/js/src/mod_fileio/common_func.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_COMMON_FUNC_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_COMMON_FUNC_H -#include "../common/napi/uni_header.h" +#include "uni_header.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/module.cpp b/interfaces/kits/js/src/mod_fileio/module.cpp index 536e84e75..0f5f12fd1 100644 --- a/interfaces/kits/js/src/mod_fileio/module.cpp +++ b/interfaces/kits/js/src/mod_fileio/module.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,13 +16,13 @@ #include #include -#include "../common/log.h" #include "class_constants/constants.h" #include "class_dir/dir_n_exporter.h" #include "class_dirent/dirent_n_exporter.h" #include "class_stat/stat_n_exporter.h" #include "class_stream/stream_n_exporter.h" #include "class_watcher/watcher_n_exporter.h" +#include "log.h" #include "properties/prop_n_exporter.h" using namespace std; diff --git a/interfaces/kits/js/src/mod_fileio/module_v9.cpp b/interfaces/kits/js/src/mod_fileio/module_v9.cpp index e1f412037..ca9280655 100644 --- a/interfaces/kits/js/src/mod_fileio/module_v9.cpp +++ b/interfaces/kits/js/src/mod_fileio/module_v9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,10 +16,10 @@ #include #include -#include "../common/log.h" #include "class_file/file_n_exporter.h" #include "class_stat_v9/stat_n_exporter_v9.h" #include "common_func.h" +#include "log.h" #include "properties/prop_n_exporter_v9.h" using namespace std; diff --git a/interfaces/kits/js/src/mod_fileio/properties/chmod.cpp b/interfaces/kits/js/src/mod_fileio/properties/chmod.cpp index adcce280d..5d851ddc1 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/chmod.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/chmod.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,13 +16,14 @@ #include "chmod.h" #include -#include #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" +#include + +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_func_arg.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/chmod.h b/interfaces/kits/js/src/mod_fileio/properties/chmod.h index 825289198..c46cf4446 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/chmod.h +++ b/interfaces/kits/js/src/mod_fileio/properties/chmod.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_CHMOD_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_CHMOD_H -#include "../../common/napi/n_val.h" +#include "n_val.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/chown.cpp b/interfaces/kits/js/src/mod_fileio/properties/chown.cpp index f8ed0df9d..ded9bf022 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/chown.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/chown.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -19,9 +19,9 @@ #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_func_arg.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/chown.h b/interfaces/kits/js/src/mod_fileio/properties/chown.h index 5ac00ec2f..18dce75e8 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/chown.h +++ b/interfaces/kits/js/src/mod_fileio/properties/chown.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_CHOWN_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_CHOWN_H -#include "../../common/napi/n_val.h" +#include "n_val.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/close.cpp b/interfaces/kits/js/src/mod_fileio/properties/close.cpp index 802466024..65b2d230d 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/close.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/close.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -19,9 +19,10 @@ #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_func_arg.h" + namespace OHOS { namespace DistributedFS { namespace ModuleFileIO { diff --git a/interfaces/kits/js/src/mod_fileio/properties/close.h b/interfaces/kits/js/src/mod_fileio/properties/close.h index 6d6a39646..4ae95e7fe 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/close.h +++ b/interfaces/kits/js/src/mod_fileio/properties/close.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_CLOSE_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_CLOSE_H -#include "../../common/napi/n_val.h" +#include "n_val.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/copy_file.cpp b/interfaces/kits/js/src/mod_fileio/properties/copy_file.cpp index 90952c07d..7205be426 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/copy_file.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/copy_file.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,16 +17,17 @@ #include #include +#include +#include + #include #include #include -#include -#include -#include "../../common/file_helper/fd_guard.h" -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" +#include "file_helper/fd_guard.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "napi/n_func_arg.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/copy_file.h b/interfaces/kits/js/src/mod_fileio/properties/copy_file.h index bef01ef1e..8b3c6e8e5 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/copy_file.h +++ b/interfaces/kits/js/src/mod_fileio/properties/copy_file.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_COPY_FILE_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_COPY_FILE_H -#include "../../common/napi/n_val.h" +#include "n_val.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/create_stream.cpp b/interfaces/kits/js/src/mod_fileio/properties/create_stream.cpp index 9318aaa2a..018fa88f8 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/create_stream.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/create_stream.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -18,15 +18,14 @@ #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_class.h" -#include "../../common/napi/n_func_arg.h" -#include "../../common/napi/n_val.h" -#include "../../common/uni_error.h" - -#include "../class_stream/stream_entity.h" -#include "../class_stream/stream_n_exporter.h" +#include "class_stream/stream_entity.h" +#include "class_stream/stream_n_exporter.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_class.h" +#include "n_func_arg.h" +#include "n_val.h" +#include "uni_error.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/create_stream.h b/interfaces/kits/js/src/mod_fileio/properties/create_stream.h index 7c58fa744..ba73f28ca 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/create_stream.h +++ b/interfaces/kits/js/src/mod_fileio/properties/create_stream.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_CREATE_STREAM_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_CREATE_STREAM_H -#include "../../common/napi/uni_header.h" +#include "uni_header.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/fchmod.cpp b/interfaces/kits/js/src/mod_fileio/properties/fchmod.cpp index 97f75b336..8f69c921c 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/fchmod.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/fchmod.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,13 +16,15 @@ #include "fchmod.h" #include #include -#include #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" +#include + +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_func_arg.h" + namespace OHOS { namespace DistributedFS { namespace ModuleFileIO { diff --git a/interfaces/kits/js/src/mod_fileio/properties/fchmod.h b/interfaces/kits/js/src/mod_fileio/properties/fchmod.h index eb7711822..3628298d5 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/fchmod.h +++ b/interfaces/kits/js/src/mod_fileio/properties/fchmod.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_FCHMOD_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_FCHMOD_H -#include "../../common/napi/n_val.h" +#include "n_val.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/fchown.cpp b/interfaces/kits/js/src/mod_fileio/properties/fchown.cpp index 0d5f00ad6..4c35eef74 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/fchown.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/fchown.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -19,9 +19,10 @@ #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_func_arg.h" + namespace OHOS { namespace DistributedFS { namespace ModuleFileIO { diff --git a/interfaces/kits/js/src/mod_fileio/properties/fchown.h b/interfaces/kits/js/src/mod_fileio/properties/fchown.h index 7439f2e54..221d93dd0 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/fchown.h +++ b/interfaces/kits/js/src/mod_fileio/properties/fchown.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_FCHOWN_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_FCHOWN_H -#include "../../common/napi/n_val.h" +#include "n_val.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/fdatasync.cpp b/interfaces/kits/js/src/mod_fileio/properties/fdatasync.cpp index 6ed950980..31f51ef49 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/fdatasync.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/fdatasync.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,15 +14,18 @@ */ #include "fdatasync.h" + #include #include -#include #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" +#include + +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_func_arg.h" + namespace OHOS { namespace DistributedFS { namespace ModuleFileIO { diff --git a/interfaces/kits/js/src/mod_fileio/properties/fdatasync.h b/interfaces/kits/js/src/mod_fileio/properties/fdatasync.h index f10fcbde3..3eb4f1391 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/fdatasync.h +++ b/interfaces/kits/js/src/mod_fileio/properties/fdatasync.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_FDATASYNC_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_FDATASYNC_H -#include "../../common/napi/n_val.h" +#include "n_val.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/fdopen_stream.cpp b/interfaces/kits/js/src/mod_fileio/properties/fdopen_stream.cpp index 3cb25ab5c..010924e09 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/fdopen_stream.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/fdopen_stream.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,17 +14,18 @@ */ #include "fdopen_stream.h" + #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_class.h" -#include "../../common/napi/n_func_arg.h" -#include "../../common/napi/n_val.h" -#include "../../common/uni_error.h" -#include "../class_stream/stream_entity.h" -#include "../class_stream/stream_n_exporter.h" +#include "class_stream/stream_entity.h" +#include "class_stream/stream_n_exporter.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_class.h" +#include "n_func_arg.h" +#include "n_val.h" +#include "uni_error.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/fdopen_stream.h b/interfaces/kits/js/src/mod_fileio/properties/fdopen_stream.h index 195369ece..b449254b4 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/fdopen_stream.h +++ b/interfaces/kits/js/src/mod_fileio/properties/fdopen_stream.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_FDOPEN_STREAM_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_FDOPEN_STREAM_H -#include "../../common/napi/uni_header.h" +#include "uni_header.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/fstat.cpp b/interfaces/kits/js/src/mod_fileio/properties/fstat.cpp index a6dfddc44..5ba9c8058 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/fstat.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/fstat.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,15 +17,14 @@ #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_class.h" -#include "../../common/napi/n_func_arg.h" -#include "../../common/napi/n_val.h" -#include "../../common/uni_error.h" - -#include "../class_stat/stat_entity.h" -#include "../class_stat/stat_n_exporter.h" +#include "class_stat/stat_entity.h" +#include "class_stat/stat_n_exporter.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_class.h" +#include "n_func_arg.h" +#include "n_val.h" +#include "uni_error.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/fstat.h b/interfaces/kits/js/src/mod_fileio/properties/fstat.h index 27395df81..d05acf0b4 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/fstat.h +++ b/interfaces/kits/js/src/mod_fileio/properties/fstat.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_FSTAT_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_FSTAT_H -#include "../../common/napi/uni_header.h" +#include "uni_header.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/fsync.cpp b/interfaces/kits/js/src/mod_fileio/properties/fsync.cpp index 1e0d27f10..f4761b1f3 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/fsync.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/fsync.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -19,9 +19,9 @@ #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_func_arg.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/fsync.h b/interfaces/kits/js/src/mod_fileio/properties/fsync.h index 0e2a54e04..7459dccb8 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/fsync.h +++ b/interfaces/kits/js/src/mod_fileio/properties/fsync.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_FSYNC_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_FSYNC_H -#include "../../common/napi/n_val.h" +#include "n_val.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/ftruncate.cpp b/interfaces/kits/js/src/mod_fileio/properties/ftruncate.cpp index ed0fb67fe..26ba27492 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/ftruncate.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/ftruncate.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -19,9 +19,9 @@ #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_func_arg.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/ftruncate.h b/interfaces/kits/js/src/mod_fileio/properties/ftruncate.h index f9d076efc..0b03edbee 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/ftruncate.h +++ b/interfaces/kits/js/src/mod_fileio/properties/ftruncate.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_FTRUNCATE_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_FTRUNCATE_H -#include "../../common/napi/n_val.h" +#include "n_val.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/hash.cpp b/interfaces/kits/js/src/mod_fileio/properties/hash.cpp index 57af090dd..935787abf 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/hash.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/hash.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -19,7 +19,7 @@ #include #include -#include "../../common/file_helper/hash_file.h" +#include "file_helper/hash_file.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/hash.h b/interfaces/kits/js/src/mod_fileio/properties/hash.h index 8aca34ce1..afd3de858 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/hash.h +++ b/interfaces/kits/js/src/mod_fileio/properties/hash.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,10 +16,10 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_HASH_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_HASH_H -#include "../../common/log.h" -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" +#include "log.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_func_arg.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/lchown.cpp b/interfaces/kits/js/src/mod_fileio/properties/lchown.cpp index 24e44fd9c..9009dfece 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/lchown.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/lchown.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -19,9 +19,10 @@ #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_func_arg.h" + namespace OHOS { namespace DistributedFS { namespace ModuleFileIO { diff --git a/interfaces/kits/js/src/mod_fileio/properties/lchown.h b/interfaces/kits/js/src/mod_fileio/properties/lchown.h index c13ad0967..7d5ecb854 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/lchown.h +++ b/interfaces/kits/js/src/mod_fileio/properties/lchown.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_LCHOWN_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_LCHOWN_H -#include "../../common/napi/n_val.h" +#include "n_val.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/link.cpp b/interfaces/kits/js/src/mod_fileio/properties/link.cpp index a6d18a42f..ce0560d1a 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/link.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/link.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -19,9 +19,9 @@ #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_func_arg.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/link.h b/interfaces/kits/js/src/mod_fileio/properties/link.h index f287a24e7..184715cee 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/link.h +++ b/interfaces/kits/js/src/mod_fileio/properties/link.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_LINK_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_LINK_H -#include "../../common/napi/n_val.h" +#include "n_val.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/lseek.cpp b/interfaces/kits/js/src/mod_fileio/properties/lseek.cpp index 11ecc64b4..bbc523633 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/lseek.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/lseek.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,13 +13,15 @@ * limitations under the License. */ #include "lseek.h" + #include #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_func_arg.h" + namespace OHOS { namespace DistributedFS { namespace ModuleFileIO { diff --git a/interfaces/kits/js/src/mod_fileio/properties/lseek.h b/interfaces/kits/js/src/mod_fileio/properties/lseek.h index b8ffb861c..7e7675241 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/lseek.h +++ b/interfaces/kits/js/src/mod_fileio/properties/lseek.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_LSEEK_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_LSEEK_H -#include "../../common/napi/n_val.h" +#include "n_val.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/lstat.cpp b/interfaces/kits/js/src/mod_fileio/properties/lstat.cpp index f6e511309..b447d9b62 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/lstat.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/lstat.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,15 +17,14 @@ #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_class.h" -#include "../../common/napi/n_func_arg.h" -#include "../../common/napi/n_val.h" -#include "../../common/uni_error.h" - -#include "../class_stat/stat_entity.h" -#include "../class_stat/stat_n_exporter.h" +#include "class_stat/stat_entity.h" +#include "class_stat/stat_n_exporter.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_class.h" +#include "n_func_arg.h" +#include "n_val.h" +#include "uni_error.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/lstat.h b/interfaces/kits/js/src/mod_fileio/properties/lstat.h index 6bd24beff..9516722f1 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/lstat.h +++ b/interfaces/kits/js/src/mod_fileio/properties/lstat.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_LSTAT_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_LSTAT_H -#include "../../common/napi/uni_header.h" +#include "uni_header.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/mkdtemp.cpp b/interfaces/kits/js/src/mod_fileio/properties/mkdtemp.cpp index 93c10eeb0..297320b7c 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/mkdtemp.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/mkdtemp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,9 +15,10 @@ #include "mkdtemp.h" -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_func_arg.h" + namespace OHOS { namespace DistributedFS { namespace ModuleFileIO { diff --git a/interfaces/kits/js/src/mod_fileio/properties/mkdtemp.h b/interfaces/kits/js/src/mod_fileio/properties/mkdtemp.h index de9a7aed1..11c894807 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/mkdtemp.h +++ b/interfaces/kits/js/src/mod_fileio/properties/mkdtemp.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_MKDTEMP_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_MKDTEMP_H -#include "../../common/napi/n_val.h" +#include "n_val.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/open.cpp b/interfaces/kits/js/src/mod_fileio/properties/open.cpp index 9ef34c2c0..2bc4be8c3 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/open.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/open.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,16 +14,17 @@ */ #include "open.h" + #include #include #include #include -#include "remote_uri.h" -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" -#include "../common_func.h" +#include "common_func.h" +#include "n_async/n_async_work_callback.h" +#include "n_async/n_async_work_promise.h" +#include "n_func_arg.h" +#include "remote_uri.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/open.h b/interfaces/kits/js/src/mod_fileio/properties/open.h index f6b6d718c..954d790cd 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/open.h +++ b/interfaces/kits/js/src/mod_fileio/properties/open.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_OPEN_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_OPEN_H -#include "../../common/napi/n_val.h" +#include "n_val.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/open_dir.cpp b/interfaces/kits/js/src/mod_fileio/properties/open_dir.cpp index d46d8b41b..c6d04b100 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/open_dir.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/open_dir.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,18 +14,19 @@ */ #include "open_dir.h" + #include #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_class.h" -#include "../../common/napi/n_func_arg.h" -#include "../../common/napi/n_val.h" -#include "../../common/uni_error.h" -#include "../class_dir/dir_entity.h" -#include "../class_dir/dir_n_exporter.h" +#include "class_dir/dir_entity.h" +#include "class_dir/dir_n_exporter.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_class.h" +#include "n_func_arg.h" +#include "n_val.h" +#include "uni_error.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/open_dir.h b/interfaces/kits/js/src/mod_fileio/properties/open_dir.h index e2e07d3b0..55429834d 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/open_dir.h +++ b/interfaces/kits/js/src/mod_fileio/properties/open_dir.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_OPEN_DIR_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_OPEN_DIR_H -#include "../../common/napi/uni_header.h" +#include "uni_header.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/open_v9.h b/interfaces/kits/js/src/mod_fileio/properties/open_v9.h index ac8921b4c..2c61283c5 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/open_v9.h +++ b/interfaces/kits/js/src/mod_fileio/properties/open_v9.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,7 +17,7 @@ #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_OPEN_V9_H #include "iremote_broker.h" -#include "../../common/napi/uni_header.h" +#include "uni_header.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/posix_fallocate.cpp b/interfaces/kits/js/src/mod_fileio/properties/posix_fallocate.cpp index fe9694d36..c9150bbdb 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/posix_fallocate.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/posix_fallocate.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,14 +13,15 @@ * limitations under the License. */ #include "posix_fallocate.h" + #include #include #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_func_arg.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/posix_fallocate.h b/interfaces/kits/js/src/mod_fileio/properties/posix_fallocate.h index c26c70465..4522b78fc 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/posix_fallocate.h +++ b/interfaces/kits/js/src/mod_fileio/properties/posix_fallocate.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_POSIX_FALLOCATE_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_POSIX_FALLOCATE_H -#include "../../common/napi/n_val.h" +#include "n_val.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/prop_n_exporter.cpp b/interfaces/kits/js/src/mod_fileio/properties/prop_n_exporter.cpp index 05567297f..b62f235a3 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/prop_n_exporter.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/prop_n_exporter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -21,10 +21,10 @@ #include #include -#include "../common_func.h" #include "chmod.h" #include "chown.h" #include "close.h" +#include "common_func.h" #include "copy_file.h" #include "create_stream.h" #include "fchmod.h" @@ -40,8 +40,8 @@ #include "lseek.h" #include "lstat.h" #include "mkdtemp.h" -#include "open.h" #include "open_dir.h" +#include "open.h" #include "posix_fallocate.h" #include "read_dir.h" #include "read_text.h" diff --git a/interfaces/kits/js/src/mod_fileio/properties/prop_n_exporter.h b/interfaces/kits/js/src/mod_fileio/properties/prop_n_exporter.h index 107a12381..f5061d7a8 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/prop_n_exporter.h +++ b/interfaces/kits/js/src/mod_fileio/properties/prop_n_exporter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,10 +16,10 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_PROP_N_EXPORTER_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_PROP_N_EXPORTER_H -#include "../../common/napi/n_async/n_ref.h" -#include "../../common/napi/n_exporter.h" -#include "../../common/napi/n_val.h" -#include "../../common/uni_error.h" +#include "n_async/n_ref.h" +#include "n_exporter.h" +#include "n_val.h" +#include "uni_error.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/read_dir.cpp b/interfaces/kits/js/src/mod_fileio/properties/read_dir.cpp index 6a3164701..470a03e18 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/read_dir.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/read_dir.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -20,12 +20,12 @@ #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_class.h" -#include "../../common/napi/n_func_arg.h" -#include "../../common/napi/n_val.h" -#include "../../common/uni_error.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_class.h" +#include "n_func_arg.h" +#include "n_val.h" +#include "uni_error.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/read_dir.h b/interfaces/kits/js/src/mod_fileio/properties/read_dir.h index e08fdcbfd..7fe0b4d38 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/read_dir.h +++ b/interfaces/kits/js/src/mod_fileio/properties/read_dir.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_READ_DIR_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_READ_DIR_H -#include "../../common/napi/uni_header.h" +#include "uni_header.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/read_text.cpp b/interfaces/kits/js/src/mod_fileio/properties/read_text.cpp index 4a2b909b6..181f4c17f 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/read_text.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/read_text.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,14 +16,16 @@ #include #include -#include #include #include -#include "../../common/file_helper/fd_guard.h" -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" -#include "../common_func.h" + +#include + +#include "common_func.h" +#include "file_helper/fd_guard.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_func_arg.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/read_text.h b/interfaces/kits/js/src/mod_fileio/properties/read_text.h index b56fc7efc..6c2c5426a 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/read_text.h +++ b/interfaces/kits/js/src/mod_fileio/properties/read_text.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,9 +16,9 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_READ_TEXT_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_READ_TEXT_H -#include "../../common/napi/n_async/n_ref.h" -#include "../../common/napi/n_val.h" -#include "../../common/uni_error.h" +#include "n_ref.h" +#include "n_val.h" +#include "uni_error.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/rename.cpp b/interfaces/kits/js/src/mod_fileio/properties/rename.cpp index 5d81388bc..663329148 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/rename.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/rename.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -19,9 +19,9 @@ #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_func_arg.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/rename.h b/interfaces/kits/js/src/mod_fileio/properties/rename.h index 0333170a6..47295d6cf 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/rename.h +++ b/interfaces/kits/js/src/mod_fileio/properties/rename.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,8 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_RENAME_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_RENAME_H -#include "../../common/napi/n_val.h" +#include "n_val.h" + namespace OHOS { namespace DistributedFS { namespace ModuleFileIO { diff --git a/interfaces/kits/js/src/mod_fileio/properties/rmdir.cpp b/interfaces/kits/js/src/mod_fileio/properties/rmdir.cpp index 46111a91b..df7e93517 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/rmdir.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/rmdir.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -18,9 +18,11 @@ #include #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" + +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_func_arg.h" + namespace OHOS { namespace DistributedFS { namespace ModuleFileIO { diff --git a/interfaces/kits/js/src/mod_fileio/properties/rmdir.h b/interfaces/kits/js/src/mod_fileio/properties/rmdir.h index 6e6e7bffe..f509e732d 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/rmdir.h +++ b/interfaces/kits/js/src/mod_fileio/properties/rmdir.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_RMDIR_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_RMDIR_H -#include "../../common/napi/n_val.h" +#include "n_val.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/rmdirent.cpp b/interfaces/kits/js/src/mod_fileio/properties/rmdirent.cpp index 2782d1b58..6f9cbfc26 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/rmdirent.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/rmdirent.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,14 +17,15 @@ #include #include -#include -#include #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" +#include +#include + +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_func_arg.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/rmdirent.h b/interfaces/kits/js/src/mod_fileio/properties/rmdirent.h index b63e528d1..07cb186db 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/rmdirent.h +++ b/interfaces/kits/js/src/mod_fileio/properties/rmdirent.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_RMDIRENT_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_RMDIRENT_H -#include "../../common/napi/n_val.h" +#include "n_val.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/stat.cpp b/interfaces/kits/js/src/mod_fileio/properties/stat.cpp index 21d6f16fc..29fc87c36 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/stat.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/stat.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,15 +17,14 @@ #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_class.h" -#include "../../common/napi/n_func_arg.h" -#include "../../common/napi/n_val.h" -#include "../../common/uni_error.h" - -#include "../class_stat/stat_entity.h" -#include "../class_stat/stat_n_exporter.h" +#include "class_stat/stat_entity.h" +#include "class_stat/stat_n_exporter.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_class.h" +#include "n_func_arg.h" +#include "n_val.h" +#include "uni_error.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/stat.h b/interfaces/kits/js/src/mod_fileio/properties/stat.h index 8b16373e9..338074187 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/stat.h +++ b/interfaces/kits/js/src/mod_fileio/properties/stat.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_STAT_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_STAT_H -#include "../../common/napi/uni_header.h" +#include "uni_header.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/stat_v9.cpp b/interfaces/kits/js/src/mod_fileio/properties/stat_v9.cpp index 8c1f90b3b..18f31d29c 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/stat_v9.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/stat_v9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,16 +17,15 @@ #include #include -#include "../../common/file_helper/fd_guard.h" -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_class.h" -#include "../../common/napi/n_func_arg.h" -#include "../../common/napi/n_val.h" -#include "../../common/uni_error.h" - -#include "../class_stat_v9/stat_entity_v9.h" -#include "../class_stat_v9/stat_n_exporter_v9.h" +#include "class_stat_v9/stat_entity_v9.h" +#include "class_stat_v9/stat_n_exporter_v9.h" +#include "file_helper/fd_guard.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_class.h" +#include "n_func_arg.h" +#include "n_val.h" +#include "uni_error.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/stat_v9.h b/interfaces/kits/js/src/mod_fileio/properties/stat_v9.h index ecdd703cd..a43346529 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/stat_v9.h +++ b/interfaces/kits/js/src/mod_fileio/properties/stat_v9.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_STAT_V9_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_STAT_V9_H -#include "../../common/napi/uni_header.h" +#include "uni_header.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/symlink.cpp b/interfaces/kits/js/src/mod_fileio/properties/symlink.cpp index c8b277b49..24123293b 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/symlink.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/symlink.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,14 +14,16 @@ */ #include "symlink.h" + #include #include #include #include -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_func_arg.h" + namespace OHOS { namespace DistributedFS { namespace ModuleFileIO { diff --git a/interfaces/kits/js/src/mod_fileio/properties/symlink.h b/interfaces/kits/js/src/mod_fileio/properties/symlink.h index b770a27e8..19db81aef 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/symlink.h +++ b/interfaces/kits/js/src/mod_fileio/properties/symlink.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_SYMLINK_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_SYMLINK_H -#include "../../common/napi/n_val.h" +#include "n_val.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/truncate.h b/interfaces/kits/js/src/mod_fileio/properties/truncate.h index b4f32e026..faf6a68f6 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/truncate.h +++ b/interfaces/kits/js/src/mod_fileio/properties/truncate.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,10 +16,10 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_TRUNCATE_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_TRUNCATE_H -#include "../../common/log.h" -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" +#include "log.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_func_arg.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/truncate_v9.cpp b/interfaces/kits/js/src/mod_fileio/properties/truncate_v9.cpp index 1dc96c3cf..e1e3452d1 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/truncate_v9.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/truncate_v9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -19,7 +19,7 @@ #include #include -#include "../../common/file_helper/fd_guard.h" +#include "file_helper/fd_guard.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/truncate_v9.h b/interfaces/kits/js/src/mod_fileio/properties/truncate_v9.h index 2defe6b2d..bd6fceb50 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/truncate_v9.h +++ b/interfaces/kits/js/src/mod_fileio/properties/truncate_v9.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,10 +16,10 @@ #ifndef INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_TRUNCATE_V9_H #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_TRUNCATE_V9_H -#include "../../common/log.h" -#include "../../common/napi/n_async/n_async_work_callback.h" -#include "../../common/napi/n_async/n_async_work_promise.h" -#include "../../common/napi/n_func_arg.h" +#include "log.h" +#include "n_async_work_callback.h" +#include "n_async_work_promise.h" +#include "n_func_arg.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fileio/properties/watcher.cpp b/interfaces/kits/js/src/mod_fileio/properties/watcher.cpp index 822043cb0..c95c5c0ff 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/watcher.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/watcher.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -20,15 +20,15 @@ #include #include -#include "../../common/napi/n_async/n_ref.h" -#include "../../common/napi/n_class.h" -#include "../../common/napi/n_func_arg.h" -#include "../../common/napi/n_val.h" -#include "../../common/uni_error.h" +#include "class_watcher/watcher_entity.h" +#include "class_watcher/watcher_n_exporter.h" #include "file_utils.h" +#include "n_class.h" +#include "n_func_arg.h" +#include "n_ref.h" +#include "n_val.h" +#include "uni_error.h" -#include "../class_watcher/watcher_entity.h" -#include "../class_watcher/watcher_n_exporter.h" namespace OHOS { namespace DistributedFS { namespace ModuleFileIO { diff --git a/interfaces/kits/js/src/mod_fileio/properties/watcher.h b/interfaces/kits/js/src/mod_fileio/properties/watcher.h index 45c100cb2..0c85afe62 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/watcher.h +++ b/interfaces/kits/js/src/mod_fileio/properties/watcher.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,7 +17,7 @@ #define INTERFACES_KITS_JS_SRC_MOD_FILEIO_PROPERTIES_WATCHER_H #include -#include "../../common/napi/n_val.h" +#include "n_val.h" namespace OHOS { namespace DistributedFS { diff --git a/interfaces/kits/js/src/mod_fs/class_file/file_n_exporter.cpp b/interfaces/kits/js/src/mod_fs/class_file/file_n_exporter.cpp index f323319c1..c6ef67780 100644 --- a/interfaces/kits/js/src/mod_fs/class_file/file_n_exporter.cpp +++ b/interfaces/kits/js/src/mod_fs/class_file/file_n_exporter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,20 +13,22 @@ * limitations under the License. */ -#include "file_entity.h" #include "file_n_exporter.h" #include #include #include #include -#include #include +#include + +#include "common_func.h" +#include "file_entity.h" #include "file_utils.h" #include "filemgmt_libhilog.h" #include "filemgmt_libn.h" -#include "../common_func.h" + #if !defined(WIN_PLATFORM) && !defined(IOS_PLATFORM) #include "file_uri.h" #endif diff --git a/interfaces/kits/js/src/mod_fs/class_randomaccessfile/randomaccessfile_n_exporter.cpp b/interfaces/kits/js/src/mod_fs/class_randomaccessfile/randomaccessfile_n_exporter.cpp index bbe140fbb..4a2350c68 100644 --- a/interfaces/kits/js/src/mod_fs/class_randomaccessfile/randomaccessfile_n_exporter.cpp +++ b/interfaces/kits/js/src/mod_fs/class_randomaccessfile/randomaccessfile_n_exporter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,9 +17,9 @@ #include +#include "common_func.h" #include "file_utils.h" #include "randomaccessfile_entity.h" -#include "../common_func.h" namespace OHOS { namespace FileManagement { diff --git a/interfaces/kits/js/src/mod_fs/class_watcher/watcher_n_exporter.cpp b/interfaces/kits/js/src/mod_fs/class_watcher/watcher_n_exporter.cpp index ea1d95224..18afa4652 100644 --- a/interfaces/kits/js/src/mod_fs/class_watcher/watcher_n_exporter.cpp +++ b/interfaces/kits/js/src/mod_fs/class_watcher/watcher_n_exporter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -20,10 +20,10 @@ #include #include -#include "../common_func.h" +#include "common_func.h" #include "file_utils.h" -#include "filemgmt_libn.h" #include "filemgmt_libhilog.h" +#include "filemgmt_libn.h" #include "securec.h" namespace OHOS::FileManagement::ModuleFileIO { diff --git a/interfaces/kits/js/src/mod_fs/properties/watcher.cpp b/interfaces/kits/js/src/mod_fs/properties/watcher.cpp index b9fc7eb74..5f9dbef6a 100644 --- a/interfaces/kits/js/src/mod_fs/properties/watcher.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/watcher.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -21,10 +21,11 @@ #include #include +#include "class_watcher/watcher_entity.h" +#include "class_watcher/watcher_n_exporter.h" #include "file_utils.h" #include "filemgmt_libhilog.h" -#include "../class_watcher/watcher_entity.h" -#include "../class_watcher/watcher_n_exporter.h" + namespace OHOS::FileManagement::ModuleFileIO { using namespace std; using namespace OHOS::FileManagement::LibN; diff --git a/interfaces/kits/native/BUILD.gn b/interfaces/kits/native/BUILD.gn index 37a3a3f42..57a18d791 100644 --- a/interfaces/kits/native/BUILD.gn +++ b/interfaces/kits/native/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2024 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -186,6 +186,7 @@ ohos_shared_library("fileio_native") { "ability_base:zuri", "app_file_service:fileuri_native", "bounds_checking_function:libsec_shared", + "c_utils:utils", "hilog:libhilog", ] innerapi_tags = [ "platformsdk" ] diff --git a/interfaces/kits/rust/BUILD.gn b/interfaces/kits/rust/BUILD.gn index 965a4ec21..654f0d8c6 100644 --- a/interfaces/kits/rust/BUILD.gn +++ b/interfaces/kits/rust/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") config("public_config") { - include_dirs = [ "include/rust_file.h" ] + include_dirs = [ "./include" ] } ohos_rust_shared_ffi("rust_file") { @@ -24,8 +24,10 @@ ohos_rust_shared_ffi("rust_file") { sources = [ "src/lib.rs" ] crate_name = "rust_file" rustflags = [ "-Zstack-protector=all" ] - deps = [ "//third_party/rust/crates/libc:lib" ] - external_deps = [ "hilog:hilog_rust" ] + external_deps = [ + "hilog:hilog_rust", + "rust_libc:lib", + ] innerapi_tags = [ "platformsdk" ] public_configs = [ ":public_config" ] } diff --git a/interfaces/kits/ts/gen_obj.gni b/interfaces/kits/ts/gen_obj.gni index ba5c656dc..793707e37 100644 --- a/interfaces/kits/ts/gen_obj.gni +++ b/interfaces/kits/ts/gen_obj.gni @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -14,7 +14,6 @@ import("//build/config/clang/clang.gni") import("//build/ohos.gni") -ace_root = "//foundation/arkui/ace_engine" is_ohos_standard_system = is_standard_system && !is_arkui_x use_mingw_win = "${current_os}_${current_cpu}" == "mingw_x86_64" use_mac = "${current_os}_${current_cpu}" == "mac_x64" || @@ -53,19 +52,19 @@ template("gen_obj") { if (use_mingw_win) { objcopy_tool = objcopy_mingw - script = "$ace_root/build/tools/build_resource_to_bytecode.py" + script = "//build/config/components/ace_engine/build_resource_to_bytecode.py" } else if (use_mac || target_os == "ios") { objcopy_tool = objcopy_clang - script = "$ace_root/build/tools/build_resource_to_bytecode.py" + script = "//build/config/components/ace_engine/build_resource_to_bytecode.py" } else if (use_linux) { objcopy_tool = objcopy_x86_64 - script = "$ace_root/build/tools/build_resource_to_bytecode.py" + script = "//build/config/components/ace_engine/build_resource_to_bytecode.py" } else if (target_cpu == "x86_64") { objcopy_tool = objcopy_x86_64 - script = "$ace_root/build/tools/run_objcopy.py" + script = "//build/scripts/run_objcopy.py" } else { objcopy_tool = objcopy_default - script = "$ace_root/build/tools/run_objcopy.py" + script = "//build/scripts/run_objcopy.py" } args = [ diff --git a/interfaces/kits/ts/streamhash/BUILD.gn b/interfaces/kits/ts/streamhash/BUILD.gn index a27f83fe4..4b67ec4e3 100644 --- a/interfaces/kits/ts/streamhash/BUILD.gn +++ b/interfaces/kits/ts/streamhash/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni") +import("//build/config/components/ets_frontend/es2abc_config.gni") import("//foundation/filemanagement/file_api/file_api.gni") import("//foundation/filemanagement/file_api/interfaces/kits/ts/gen_obj.gni") @@ -130,5 +130,5 @@ ohos_source_set("streamhash_static") { } group("streamhash_packages") { - public_deps = [ ":streamhash" ] + deps = [ ":streamhash" ] } diff --git a/interfaces/kits/ts/streamrw/BUILD.gn b/interfaces/kits/ts/streamrw/BUILD.gn index a2eece6f1..be4fab732 100644 --- a/interfaces/kits/ts/streamrw/BUILD.gn +++ b/interfaces/kits/ts/streamrw/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni") +import("//build/config/components/ets_frontend/es2abc_config.gni") import("//foundation/filemanagement/file_api/file_api.gni") import("//foundation/filemanagement/file_api/interfaces/kits/ts/gen_obj.gni") @@ -130,5 +130,5 @@ ohos_source_set("streamrw_static") { } group("streamrw_packages") { - public_deps = [ ":streamrw" ] + deps = [ ":streamrw" ] } diff --git a/interfaces/test/unittest/class_file/BUILD.gn b/interfaces/test/unittest/class_file/BUILD.gn index 535c6f5b5..b2bacc89d 100644 --- a/interfaces/test/unittest/class_file/BUILD.gn +++ b/interfaces/test/unittest/class_file/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -23,8 +23,7 @@ ohos_unittest("class_file_test") { include_dirs = [ "${file_api_path}/interfaces/kits/rust/include" ] - deps = [ - "${file_api_path}/interfaces/kits/rust:rust_file", - "//third_party/googletest:gtest_main", - ] + deps = [ "${file_api_path}/interfaces/kits/rust:rust_file" ] + + external_deps = [ "googletest:gtest_main" ] } diff --git a/interfaces/test/unittest/filemgmt_libn_test/BUILD.gn b/interfaces/test/unittest/filemgmt_libn_test/BUILD.gn index ea20a1cf9..bd8ecb347 100644 --- a/interfaces/test/unittest/filemgmt_libn_test/BUILD.gn +++ b/interfaces/test/unittest/filemgmt_libn_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2023 Huawei Device Co., Ltd. +# Copyright (C) 2023-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -28,13 +28,13 @@ ohos_unittest("filemgmt_libn_test") { deps = [ "${utils_path}/filemgmt_libhilog:filemgmt_libhilog", "${utils_path}/filemgmt_libn:filemgmt_libn", - "//third_party/googletest:gtest_main", ] external_deps = [ "access_token:libaccesstoken_sdk", "c_utils:utils", "c_utils:utilsbase", + "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "napi:ace_napi", diff --git a/interfaces/test/unittest/remote_uri/BUILD.gn b/interfaces/test/unittest/remote_uri/BUILD.gn index 41788952a..5b652a574 100644 --- a/interfaces/test/unittest/remote_uri/BUILD.gn +++ b/interfaces/test/unittest/remote_uri/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -26,16 +26,14 @@ ohos_unittest("remote_uri_test") { "${file_api_path}/interfaces/kits/native/remote_uri", ] - deps = [ - "${file_api_path}/interfaces/kits/native:remote_uri_native", - "//third_party/googletest:gtest_main", - ] + deps = [ "${file_api_path}/interfaces/kits/native:remote_uri_native" ] external_deps = [ "ability_base:zuri", "access_token:libaccesstoken_sdk", "c_utils:utils", "c_utils:utilsbase", + "googletest:gtest_main", "ipc:ipc_core", ] } diff --git a/interfaces/test/unittest/task_signal/BUILD.gn b/interfaces/test/unittest/task_signal/BUILD.gn index d4de828b5..2f9900498 100644 --- a/interfaces/test/unittest/task_signal/BUILD.gn +++ b/interfaces/test/unittest/task_signal/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -29,11 +29,11 @@ ohos_unittest("task_signal_test") { deps = [ "${file_api_path}/interfaces/kits/native:task_signal_native", "${utils_path}/filemgmt_libhilog:filemgmt_libhilog", - "//third_party/googletest:gtest_main", ] external_deps = [ "c_utils:utils", + "googletest:gtest_main", "hilog:libhilog", ] } -- Gitee