diff --git a/bundle.json b/bundle.json index d2f531cf4cb28c6b6e9957904aa35d03de5266af..2edbfd663a7d9e4d1faf6169501620f2868c0bd5 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 9e0d343959a8481bdc616b84e6cffb6aa26335e7..518d718c8dd63ce7aa73b31e6c4b18e3c16dea22 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 2e3ce4ccbbf02af331cffa3f00dd3a60410eebef..758b5c01e90e6a3d6ec9c65e6b74df3ccc56e563 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 c7a6d2e96bf307af17208af7fa08fc9408563c52..509e945181ede4feebb64a46264d291b4b5387d9 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 716f9e7c36388defb279e394d51e1b90e4c9cdb1..5a98cb0d1b98101099f09b8888cc4bedb622ccab 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 4004cf64624e9a89d1cbcff6365d836e31ed79c1..71904b4af2f96ab41ae8761f20e73225aada5b88 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 9fc445f9ab59139dfe499b9fb3c1c33d8d637021..1fad4e0e9161834e3cb76c4bbe3db8b80ce6d624 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 6959b45a52f534f468561ff090199b2e3c5f8735..6ca489d3f6a19e81eec8f1cc029ec81ee87cfa04 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 87339bbdddfdc837b658e60e7026f2bc10e6bdc7..0daf0d971262a2ded90bc92f02507c1c223ac701 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 75136db63bd81f8e8864c21c924c5e105ab50406..c85f924502ba7c679a8fa7c88c67c1dbdf65a218 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 1ba6a0fdb0d2339bca96cfff86975fe37c4f2894..85883021cd0c57b926dc6ce6a7e5d1db20c3cef6 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 a9f166cfc50cc5f2e6920711c4a57da2ba0db4ed..e66ef78503b40606065d9c4a904399936a0bcdae 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 191fefc0de2694d4329c5565d53f77f15b3306a6..8e4c08d284e656497aae77de4460826a04e1132a 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 171b7f6274f693ada55a823a82e2c68b19d14466..9296468bd7ab0515970ae98b13fdc6e3136efd9f 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 aa2cc60c758337a8a1fa9eb799732713b22c8c5f..ab80b1c598cdf0a1a66a78b969931d59167fe438 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 a0b7fe6e060c70a76e14abf81d99e12f71e77a20..2f739931978520f7e634f44077d0a7e500a3eb0a 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 a23741bc796a91bd97accd0fe451aa6ebe8ffed6..d2eb2d14ac90ba0891e17a3404735767b49c1abc 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 653e1e6c7b2017863358e6ed8ab7bd1bffa9afb0..10bd380102d2cda917b3f33b2fd8c58fb8e42365 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 01f591e74928233f30d421f2474786e3aa46a53b..46fdb198ef3db3a350a53669f0bbe613e6fac004 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 f39a8069ea84c2e58d15649705fd7fe6fd626a51..dc5434cd9b30e1af5b8efe4995314ca60e9f4f29 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 4a9fa3d399a5552adb98a1ff64d32c852a96ad7e..73f52d935f3b35edfafc366ebb48390162da79bb 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 207411602e2346198b7edc1aae12e0ae06f0f160..85ac917257048ce2fe5fedc160451a68b085aeda 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 b4588cf4525f7fc744eb2a78c62d81149e98d93b..1aba9024bbebed791c0801b747ac914ca3c6265a 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 f046d8e849d58b86c07cab27d068a227cbb98b86..c557acfe3c3c18eeaadf103be53fa93e8d6b4a1d 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 59da2b0bf163f856963990cedf983721269e9a13..f42aacf7365dd301054c47b11fb7b73ac7c6bc9e 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 ae1339bd53f3aa189daf397d5228e6fe2ba2953f..d1c4b319e9d584a65b699d48eff7de9f14dc0d23 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 a40ed03d2b542f5ef501fdd4cd3c922bae2d2e2f..0ecc22ee90b540325063490af1d570e4f2f684df 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 29b78ca89dfc802e8130b98dd113c92424b9103d..745ade32bde1c30f4bd15e0f65bb5cfd797d5f22 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 0f60629e09429656f044da1090fa5974c116b994..0584f2a5b8e8f46a645df952e992144819999498 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 9a82a6f7900f8364a6a5cedc98794a94ac5a0516..8737c5d1055fc69bc7469d4b44f1fd6dd4c934d9 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 4eeb63358e881794c575b497ff2618a236cf0553..7946542fd5e5b2c86881ce3b0fd7d329c4f6235a 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 c77716e6123e00726a32d35851e0383bd047b8a1..4a7b85a2b7c7edfbe38a3e4c539939e005f1b5cb 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 40c0ca18fe2db64a90095e06c124124224938b3b..b80b1bd4717bcf79d29994441ebb3f79b517bd70 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 4304856649cc81f9e6b455207e98a3f1dc6b208b..966df112b97d64da4706f4f2a53717b316d5a90e 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 fb2768f698b00b72d525ed2108c7fa2e1b354d1e..856cc3ee9e7163dba149e855c55eab3c3b86254d 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 c686e3d86b7a1255b627a20aeaa94c97fd6cc0ba..4b7d74087c850cd7a61a0d92728674d0a4d850d7 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 590b47e95eea7e25a8e5c85fa91c23764ca2300c..13bbe13c9768a9786be0c79110fc1f155aeb8495 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 c616571b3f8c3435cbb0ea2bd336661f18bff024..969a29c8dfd950c32bf268dc121100247b6c80ab 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 611dcfc3d4275718ce66e99a1a265ec6bbea6c42..b27d6a71e2a49c669765a903b015cb62850bc1bf 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 3cfe4d2d204f21f3481e4518094bae338f7bede8..4f00cd6d5ba17d41ac9ee289380460c596f42edd 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 ce604ee6b042eb0159ba61ad0bd1fd0251c9ebbb..716c66b685148e033572955f283e5268493c43a5 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 2947b10cb50e5d108cb3d81e27eb5ee9e53f8274..360d1574a9f070ff9f6604b54ea3c20b7eef0660 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 3d3502b7babfd5d7c3037cb51d1aee7e1ffa845a..13c648ef7d58a11871a23819f2c8d8fbaa1657d8 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 b29b270eba3048ee7e0fa791e5a5a1d38f453b1d..8df8b02dd1da15ae040f8c3ec3f63f54dc203359 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 b76ad5469024a1030ae81bd835029f9cd02cd72e..37ee34cc5bf6f921b2fef75b8234beb64849ce35 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 536e84e7555ae1027b411c8b7abd10f2d579d475..0f5f12fd178b477f57a49d54433d7d7f9e16505f 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 e1f412037e993d688f6ee045e01c6b0b22a45ea9..ca928065568c5364006b9ac3761edbc7e9aa1881 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 adcce280de289333bec5ccb4a7f82f32a32eaca7..5d851ddc14d2c7dfc492a57b4947ce98012bc869 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 825289198b788ae310362e2850ff1e508e4dfe4f..c46cf4446d8eabd474232add667cc755c1922337 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 f8ed0df9d70f2638ce5853bff68b2c848f723e84..ded9bf0220096b9895577c220c4bc0b5b62e1d65 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 5ac00ec2fa502fa6f1bb70227a6e28c8f12dcf0b..18dce75e8c19a705a242823b559adc3b441dae53 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 8024660246bc8babc25fdd2c50123ccd29cd5df7..65b2d230d737e7419b1d5c46fd28fe84046115db 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 6d6a3964682a2e10c6f29306fea72a396b9544a0..4ae95e7fe3d0244e22a26e594e9dc5bf06b619de 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 90952c07d39286d071e00b15bba0da0c0ea5f3bb..7205be426a91d540c169ea0a36d656fcaaff6d55 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 bef01ef1e7a6d0ee54ad37903525210be32e9d98..8b3c6e8e5a1db60d3bf0c9a99d2181129f1aee8d 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 9318aaa2a866f4873c3b85a6e3739fda0e93af3f..018fa88f8a564a88ec0374bf2fb0b99de4152926 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 7c58fa744a9dbb7a0e85d3c7e7258b4695c8c13c..ba73f28ca991001b7c903b3a758ad9fab79e5c8b 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 97f75b336aece34e9c60b8aa4145a03d5f8c50a1..8f69c921c7a4d532109bfafe00af73f684a4b3ac 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 eb7711822870984742d1190bedfb61200768b2d6..3628298d582db73e4e618977b9a2a0cd1c31027e 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 0d5f00ad68f4ffa9ecb154921e656994b8c7a92f..4c35eef74df46acfa56d40b9bd8c578cb774d282 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 7439f2e542f346eeb6f8c9affaca8f3a8705e752..221d93dd022ff9890e84a7c81067513598d75b29 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 6ed9509800b4ee1e8b7fb3a6983ac2db63a090a1..31f51ef49ccaa57282557a0115a242140980136a 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 f10fcbde3a1faa694680ef8ce97aaba17824e65f..3eb4f1391a857dc369a6865f0602a1c9af56c03d 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 3cb25ab5cc420a436d1c05f2b49a9bd32bcd9327..010924e09e68ca10bf3128b5dc3cab0cc7ed1c8e 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 195369eceec8a73a7278380675ae64be6a358626..b449254b41a96710ef1b1ef042de442322de6849 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 a6dfddc44d7d411823cee9b82da406a961db1ed3..5ba9c805849526f651e559aa3ba2ec813607b703 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 27395df81e9d5802c873d5c7be42b066fc254640..d05acf0b4d92ad540d5356d43fe9915001100f6f 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 1e0d27f10547b01b2ab978286d039fdd233ae5ab..f4761b1f3e482927812d222e7f1dab68d31478b8 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 0e2a54e040fd05388608de6d0bc3a38ad264c868..7459dccb81a63a36b17ec09b2b6572fb91eb1fad 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 ed0fb67fe07daf37ab551593fac9aeee9e6a3389..26ba27492913ea91e794e557f453bf71addb5ea4 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 f9d076efc337ce69f6ea7d804d07a580964b1c91..0b03edbee9cd0e0d73e4ca6af1df290f0acf552a 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 57af090dd00aa475febb7c7f4d30f2c808472fbe..935787abf088e8d3f95ca82235b6c29cc1a12032 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 8aca34ce1315691044ee8e86d9605a104a8c07d1..afd3de858016b443496caf31062820653155a780 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 24e44fd9c8a4e3d777c7e95f43a6e9b56f77f189..9009dfecea25b8d66e8c17e702935ebea72f04a0 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 c13ad09673d250a4185c7b6ca36cbb0fef0896be..7d5ecb8541b74ddd353a036e443d5ebc34a9ce89 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 a6d18a42f3f319951839a0268b4e95f611442250..ce0560d1a5b8faf23cbecd789a67d0a44017717d 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 f287a24e75023561a4227eab08be337b337ded7e..184715cee30a823637732df6f8cba0c596b8f9e8 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 11ecc64b4a77618348d2ddf686e030b6e6a448b2..bbc523633e6e3d0a7a8ed0d255cb89e574fa1922 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 b8ffb861cb7b6daa8193e42dd1fee4d659c1d018..7e7675241d038af035b2494603d949c8e7ca7a0d 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 f6e511309d96b3cec718f988509e88637d028ddf..b447d9b62cb9588744488b91c5f6894fe8233bdb 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 6bd24beff996b5bfc26c1caec660f5c57cd8e242..9516722f1b7133b852aecbd67d5326ceaec6c2a1 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 93c10eeb0c3a7f06d53ae8d8210c45734b8a5906..297320b7cec041aca729df02e47b558c3be4c276 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 de9a7aed1df9d29d2737ea623ce7059ce388a93d..11c89480794cd152a063a8816e5fc1038c096335 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 9ef34c2c01ca3687f6d60b132d67cf788afeee1c..2bc4be8c31906af9d070ebce3b07d4a5da9d8ce9 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 f6b6d718cb0f58c91b30071ac11a87459fc8f765..954d790cdacc8023346ea632aa80753449cb3519 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 d46d8b41b3a5444785c6d007d0899269133ede70..c6d04b10090ee88484c4f781ca16b15f12a3593b 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 e2e07d3b068ca8b5f40d7c98b0eef91a0abcf57d..55429834d2e6c0a53fa9c1de34303de2cd8b180d 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 ac8921b4cbcbe588332b93fdfe20f3ce55c498a4..2c61283c58da5a817007b21ac46ae87a335b32f4 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 fe9694d36c184b224afee82d73bef29cb7c921c5..c9150bbdb35a173203cbde9e72c4c1508e709430 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 c26c70465bb28497c41c39f884f78d85f40f4bcf..4522b78fc41a0c0c57c928922df36d6e1398bb57 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 05567297f274ef23026e6e187573b1930d905d6e..b62f235a3b16f3c924bc7c350fb810ece49b1c64 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 107a12381d27c5180ae9930330ebb5acd0f77b5c..f5061d7a8b41cbf716cd9c4992e3266bb3f2f420 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 6a3164701828ddb1dbde73a7aa09210d8882daf7..470a03e18390d5a084977b7d9b324a7ed44f190b 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 e08fdcbfddbdb82b8117879ec2eb5ef6cd56c828..7fe0b4d38e9e13fa98270d6dd9354f896a164872 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 4a2b909b6347161a40a5289a0af89aa1425db22c..181f4c17fdaae4c05e6f28aaaf7ad3dbfdbf992d 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 b56fc7efc1139705bfa4e93bda4cc1c2d3b92c6f..6c2c5426a88eb6fc274ec8d1a97efad773de1cf3 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 5d81388bc9933149f513a8ba943f12f174c3d516..6633291485e4128fa77fc2a90016a5d25a5b23cc 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 0333170a66be1f5666ae5f17de6856d0bbf4e81c..47295d6cf7859ea8e965bea218a517802754751c 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 46111a91ba0d7446fd078a361ca24c680941020c..df7e93517855f283703ebacca417bdf53b539adf 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 6e6e7bffeeda510f10ff9a79a5d08a8d7b830c4c..f509e732db318e70588814e622859ad67d1324e6 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 2782d1b58d7a35913d4552f4664dbb0ce040215a..6f9cbfc26b78c3307851c4f9bedd8625a315a52a 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 b63e528d1cf3ddff2a0323910d1848ec48589cea..07cb186db441a4799789981a74b81505339d353c 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 21d6f16fcbf804976dce8854ae26fa0072954c8a..29fc87c36b34409de7e4083465cbb462c99709ed 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 8b16373e9b313c97cbfb9c3c21c06cf521edb82f..338074187bd898b7d2d7fe29da9b8e1240812e0b 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 8c1f90b3bb082bff01baa3084a11750d06a19dca..18f31d29ca7b5d8ec8777c0fed7a37edd4acb644 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 ecdd703cde3290f1030a36501a609ff1547f22e0..a4334652998ab47cd1477628eb85b293c7ceee8b 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 c8b277b49dd9fd4888228f928481d041fff3dc1d..24123293b05385e59cdf57c135075aa115ab2230 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 b770a27e874c3392e3ae46e112a6342140ed06f7..19db81aefa3cb282e6227841515f23cc9c96c5a9 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 b4f32e0264947345ea5803bec3148181aabf347f..faf6a68f62049ed838702d99c5734e9581477002 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 1dc96c3cf156e227de3fe2107d58bb74e4be6d1c..e1e3452d1e615fb4ae9c2f6e5d31a9012f585574 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 2defe6b2de8530340271a26a6af79bd09971f755..bd6fceb50d9a1f2eeb0d231859086b3200f7f3fc 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 822043cb034396463663c08c2b1d8b4fac34c9c9..c95c5c0fff6395f0606bd85508f346e3a9adf0af 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 45c100cb21057e0a0711212df5ec9846985aebaf..0c85afe620d3434084d4fa49a7804b6012fada5b 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 f323319c16da6ad8ed770b2c438e05914d25b935..c6ef6778064fe3c226e6c376edc529d021f4cf63 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 bbe140fbb1839681212fdc407395cf9bcccac6c8..4a2350c680a66d92614a4fdafd33bd535f2153f2 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 ea1d95224eb9cd30eea1e22d9fa7cd6526814a9f..18afa4652d7d595188ab004d22890bd2e8fa2790 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 b9fc7eb7428eeafb343ce986128df55f7d061da1..5f9dbef6a36fbb357dca211f771ac22cabfa0e3e 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 37a3a3f4204aec6f5b2bc16a6c24ccaafb3ba452..57a18d791685b0300da28dc82a51bced4c7675de 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 965a4ec2138a9353e605c806118cb3e4eadf85d5..654f0d8c6c2201bc39300a5dddd32528376d8916 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 ba5c656dcd08934cfd95b86f45160ecdecf5c280..793707e37102857a60cce2c266bec435c342ab07 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 a27f83fe40d7468814d783f25737a9c809742dc2..4b67ec4e38ec5b5483f4d45f49ae0362b37bd489 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 a2eece6f1e1fc76675d23f65978db63d43078a99..be4fab7321791ddecc630b526f93f896a865bc4d 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 535c6f5b5a19562bf3bd9d07fb2d50c5e214cfc7..b2bacc89db97993c618754ab7fea989a732b49b0 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 ea20a1cf9f7b571e107d8d534852829741ebf3bb..bd8ecb3473fe0148ce528f163db2a7f9c3388e7e 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 41788952a0ad984b286eb1e29eac139c24950b57..5b652a574417d5532285b758fdab9213f5127f77 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 d4de828b534f282130715af73d7ead08aab27181..2f9900498e80121911e65beaa44b750ca51d02d5 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", ] }