From 4a43b3e3dd90e34d0cb122903e6111f4e848527f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A1=BE=E5=86=AC=E6=B4=8B?= Date: Wed, 6 Aug 2025 10:38:01 +0800 Subject: [PATCH 1/2] Modify build.gn for file_api construction MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 顾冬洋 --- interfaces/kits/js/BUILD.gn | 5 ++ interfaces/test/unittest/js/BUILD.gn | 115 +++++++++++++++++++++++++-- 2 files changed, 114 insertions(+), 6 deletions(-) diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn index 25490bdae..645ed82ba 100644 --- a/interfaces/kits/js/BUILD.gn +++ b/interfaces/kits/js/BUILD.gn @@ -835,6 +835,7 @@ ohos_shared_library("ani_file_fs") { cfi_cross_dso = true debug = false } + shlib_type = "ani" output_extension = "so" subsystem_name = "filemanagement" part_name = "file_api" @@ -905,6 +906,7 @@ ohos_shared_library("ani_file_hash") { cfi_cross_dso = true debug = false } + shlib_type = "ani" output_extension = "so" subsystem_name = "filemanagement" part_name = "file_api" @@ -969,6 +971,7 @@ ohos_shared_library("ani_file_securitylabel") { cfi_cross_dso = true debug = false } + shlib_type = "ani" output_extension = "so" subsystem_name = "filemanagement" part_name = "file_api" @@ -1035,6 +1038,7 @@ ohos_shared_library("ani_file_environment") { cfi_cross_dso = true debug = false } + shlib_type = "ani" output_extension = "so" subsystem_name = "filemanagement" part_name = "file_api" @@ -1101,6 +1105,7 @@ ohos_shared_library("ani_file_statvfs") { cfi_cross_dso = true debug = false } + shlib_type = "ani" output_extension = "so" subsystem_name = "filemanagement" part_name = "file_api" diff --git a/interfaces/test/unittest/js/BUILD.gn b/interfaces/test/unittest/js/BUILD.gn index d7b5876fc..2640a84b1 100644 --- a/interfaces/test/unittest/js/BUILD.gn +++ b/interfaces/test/unittest/js/BUILD.gn @@ -14,12 +14,20 @@ import("//build/test.gni") import("//foundation/filemanagement/file_api/file_api.gni") +ani_file_environment_core = [ + "${src_path}/common/file_helper/fd_guard.cpp", + "${src_path}/mod_environment/environment_core.cpp", + "${src_path}/mod_fs/fs_utils.cpp", +] ohos_unittest("ani_file_environment_test") { branch_protector_ret = "pac_ret" testonly = true module_out_path = "file_api/file_api" include_dirs = [ + "${file_api_path}/interfaces/kits/js/src/common/file_helper", + "${file_api_path}/interfaces/kits/js/src/mod_fs", + "${file_api_path}/interfaces/kits/js/src/common", "${src_path}/mod_environment", "${src_path}/mod_environment/ani", "${file_api_path}/interfaces/test/unittest/js/mod_environment/mock", @@ -31,9 +39,9 @@ ohos_unittest("ani_file_environment_test") { "mod_environment/mock/ipc_skeleton_mock.cpp", "mod_environment/mock/parameter_mock.cpp", ] + sources += ani_file_environment_core deps = [ - "${file_api_path}/interfaces/kits/js:ani_file_environment", "${utils_path}/filemgmt_libfs:filemgmt_libfs", "${utils_path}/filemgmt_libhilog:filemgmt_libhilog", ] @@ -56,6 +64,59 @@ ohos_unittest("ani_file_environment_test") { defines = [ "private=public" ] } +ani_file_fs_core = [ + "${src_path}/common/file_helper/fd_guard.cpp", + "${src_path}/mod_fs/class_atomicfile/fs_atomicfile.cpp", + "${src_path}/mod_fs/class_file/file_instantiator.cpp", + "${src_path}/mod_fs/class_file/fs_file.cpp", + "${src_path}/mod_fs/class_randomaccessfile/fs_randomaccessfile.cpp", + "${src_path}/mod_fs/class_readeriterator/fs_reader_iterator.cpp", + "${src_path}/mod_fs/class_stat/fs_stat.cpp", + "${src_path}/mod_fs/class_stat/stat_instantiator.cpp", + "${src_path}/mod_fs/class_stream/fs_stream.cpp", + "${src_path}/mod_fs/class_stream/stream_instantiator.cpp", + "${src_path}/mod_fs/class_tasksignal/fs_task_signal.cpp", + "${src_path}/mod_fs/class_watcher/fs_file_watcher.cpp", + "${src_path}/mod_fs/class_watcher/fs_watcher.cpp", + "${src_path}/mod_fs/class_watcher/watcher_data_cache.cpp", + "${src_path}/mod_fs/fs_utils.cpp", + "${src_path}/mod_fs/properties/access_core.cpp", + "${src_path}/mod_fs/properties/close_core.cpp", + "${src_path}/mod_fs/properties/connectdfs_core.cpp", + "${src_path}/mod_fs/properties/copy_core.cpp", + "${src_path}/mod_fs/properties/copy_dir_core.cpp", + "${src_path}/mod_fs/properties/copy_file_core.cpp", + "${src_path}/mod_fs/properties/copy_listener/trans_listener_core.cpp", + "${src_path}/mod_fs/properties/create_randomaccessfile_core.cpp", + "${src_path}/mod_fs/properties/create_stream_core.cpp", + "${src_path}/mod_fs/properties/dfs_listener/file_dfs_listener_stub.cpp", + "${src_path}/mod_fs/properties/disconnectdfs_core.cpp", + "${src_path}/mod_fs/properties/dup_core.cpp", + "${src_path}/mod_fs/properties/fdatasync_core.cpp", + "${src_path}/mod_fs/properties/fdopen_stream_core.cpp", + "${src_path}/mod_fs/properties/fsync_core.cpp", + "${src_path}/mod_fs/properties/listfile_core.cpp", + "${src_path}/mod_fs/properties/lseek_core.cpp", + "${src_path}/mod_fs/properties/lstat_core.cpp", + "${src_path}/mod_fs/properties/mkdir_core.cpp", + "${src_path}/mod_fs/properties/mkdtemp_core.cpp", + "${src_path}/mod_fs/properties/move_core.cpp", + "${src_path}/mod_fs/properties/movedir_core.cpp", + "${src_path}/mod_fs/properties/open_core.cpp", + "${src_path}/mod_fs/properties/read_core.cpp", + "${src_path}/mod_fs/properties/read_lines_core.cpp", + "${src_path}/mod_fs/properties/read_text_core.cpp", + "${src_path}/mod_fs/properties/rename_core.cpp", + "${src_path}/mod_fs/properties/rmdir_core.cpp", + "${src_path}/mod_fs/properties/stat_core.cpp", + "${src_path}/mod_fs/properties/symlink_core.cpp", + "${src_path}/mod_fs/properties/truncate_core.cpp", + "${src_path}/mod_fs/properties/unlink_core.cpp", + "${src_path}/mod_fs/properties/utimes_core.cpp", + "${src_path}/mod_fs/properties/watcher_core.cpp", + "${src_path}/mod_fs/properties/write_core.cpp", + "${src_path}/mod_fs/properties/xattr_core.cpp", +] ohos_unittest("ani_file_fs_mock_test") { branch_protector_ret = "pac_ret" testonly = true @@ -63,6 +124,10 @@ ohos_unittest("ani_file_fs_mock_test") { module_out_path = "file_api/file_api" include_dirs = [ + "./include", + "${file_api_path}/interfaces/kits/js/src/common/file_helper", + "${file_api_path}/interfaces/kits/js/src/mod_fs", + "${file_api_path}/interfaces/kits/js/src/common", "${file_api_path}/interfaces/kits/js/src/mod_fs/class_atomicfile", "${file_api_path}/interfaces/kits/js/src/mod_fs/class_file", "${file_api_path}/interfaces/kits/js/src/mod_fs/class_randomaccessfile", @@ -119,9 +184,9 @@ ohos_unittest("ani_file_fs_mock_test") { "mod_fs/properties/write_core_mock_test.cpp", "mod_fs/properties/xattr_core_mock_test.cpp", ] + sources += ani_file_fs_core deps = [ - "${file_api_path}/interfaces/kits/js:ani_file_fs", "${file_api_path}/interfaces/kits/native:remote_uri_native", "${file_api_path}/interfaces/kits/native:task_signal_native", "${file_api_path}/interfaces/kits/rust:rust_file", @@ -140,6 +205,9 @@ ohos_unittest("ani_file_fs_mock_test") { "hilog:libhilog", "ipc:ipc_core", "libuv:uv", + "data_share:datashare_common", + "data_share:datashare_consumer", + "hisysevent:libhisysevent", ] libs = [ "dl" ] @@ -159,6 +227,11 @@ ohos_unittest("ani_file_fs_test") { resource_config_file = "../resource/ohos_test.xml" include_dirs = [ + "./include", + "${file_api_path}/interfaces/kits/js/src/common/file_helper", + "${file_api_path}/interfaces/kits/js/src/mod_fs", + "${file_api_path}/interfaces/kits/js/src/common", + "${file_api_path}/interfaces/kits/js/src/mod_fs/class_watcher", "${file_api_path}/interfaces/kits/js/src/mod_fs/class_atomicfile", "${file_api_path}/interfaces/kits/js/src/mod_fs/class_file", "${file_api_path}/interfaces/kits/js/src/mod_fs/class_randomaccessfile", @@ -204,9 +277,9 @@ ohos_unittest("ani_file_fs_test") { "mod_fs/properties/write_core_test.cpp", "mod_fs/properties/xattr_core_test.cpp", ] + sources += ani_file_fs_core deps = [ - "${file_api_path}/interfaces/kits/js:ani_file_fs", "${file_api_path}/interfaces/kits/native:remote_uri_native", "${file_api_path}/interfaces/kits/native:task_signal_native", "${file_api_path}/interfaces/kits/rust:rust_file", @@ -224,25 +297,40 @@ ohos_unittest("ani_file_fs_test") { "hilog:libhilog", "ipc:ipc_core", "libuv:uv", + "data_share:datashare_common", + "data_share:datashare_consumer", + "hisysevent:libhisysevent", ] defines = [ "private=public" ] } +ani_file_hash_core = [ + "${src_path}/common/file_helper/fd_guard.cpp", + "${src_path}/common/file_helper/hash_file.cpp", + "${src_path}/mod_fs/fs_utils.cpp", + "${src_path}/mod_hash/class_hashstream/hs_hashstream.cpp", + "${src_path}/mod_hash/hash_core.cpp", +] + ohos_unittest("ani_file_hash_test") { module_out_path = "file_api/file_api" resource_config_file = "../resource/ohos_test.xml" sources = [ "mod_hash/hash_core_test.cpp" ] + sources += ani_file_hash_core include_dirs = [ + "${file_api_path}/interfaces/kits/js/src/common", + "./include", + "${file_api_path}/interfaces/kits/js/src/common/file_helper", + "${file_api_path}/interfaces/kits/js/src/mod_fs", "mock/libuv", "${file_api_path}/interfaces/kits/js/src/mod_hash", ] deps = [ - "${file_api_path}/interfaces/kits/js:ani_file_hash", "${utils_path}/filemgmt_libfs:filemgmt_libfs", "${utils_path}/filemgmt_libhilog:filemgmt_libhilog", ] @@ -253,23 +341,31 @@ ohos_unittest("ani_file_hash_test") { "googletest:gtest_main", "hilog:libhilog", "libuv:uv", + "openssl:libcrypto_shared", ] } +ani_file_securitylabel_core = [ + "${src_path}/common/file_helper/fd_guard.cpp", + "${src_path}/mod_fs/fs_utils.cpp", + "${src_path}/mod_securitylabel/securitylabel_core.cpp", +] ohos_unittest("ani_file_securitylabel_test") { module_out_path = "file_api/file_api" resource_config_file = "../resource/ohos_test.xml" sources = [ "mod_securitylabel/securitylabel_core_test.cpp" ] + sources += ani_file_securitylabel_core include_dirs = [ + "${file_api_path}/interfaces/kits/js/src/common", + "${file_api_path}/interfaces/kits/js/src/common/file_helper", "mock/libuv", "${file_api_path}/interfaces/kits/js/src/mod_securitylabel", ] deps = [ - "${file_api_path}/interfaces/kits/js:ani_file_securitylabel", "${utils_path}/filemgmt_libfs:filemgmt_libfs", "${utils_path}/filemgmt_libhilog:filemgmt_libhilog", ] @@ -283,20 +379,27 @@ ohos_unittest("ani_file_securitylabel_test") { ] } +ani_file_statvfs_core = [ + "${src_path}/common/file_helper/fd_guard.cpp", + "${src_path}/mod_fs/fs_utils.cpp", + "${src_path}/mod_statvfs/statvfs_core.cpp", +] ohos_unittest("ani_file_statvfs_test") { module_out_path = "file_api/file_api" resource_config_file = "../resource/ohos_test.xml" sources = [ "mod_statvfs/statvfs_core_test.cpp" ] + sources += ani_file_statvfs_core include_dirs = [ + "${file_api_path}/interfaces/kits/js/src/common", + "${file_api_path}/interfaces/kits/js/src/common/file_helper", "mock/libuv", "${file_api_path}/interfaces/kits/js/src/mod_statvfs", ] deps = [ - "${file_api_path}/interfaces/kits/js:ani_file_statvfs", "${utils_path}/filemgmt_libfs:filemgmt_libfs", "${utils_path}/filemgmt_libhilog:filemgmt_libhilog", ] -- Gitee From 790a5e6afdd6b3910f3ba552b1d4a706e4a58dea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A1=BE=E5=86=AC=E6=B4=8B?= Date: Wed, 6 Aug 2025 17:38:21 +0800 Subject: [PATCH 2/2] Enforce alphabetical ordering in build.gn MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 顾冬洋 --- interfaces/test/unittest/js/BUILD.gn | 29 +++++++++++++--------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/interfaces/test/unittest/js/BUILD.gn b/interfaces/test/unittest/js/BUILD.gn index 2640a84b1..069ac9f98 100644 --- a/interfaces/test/unittest/js/BUILD.gn +++ b/interfaces/test/unittest/js/BUILD.gn @@ -25,12 +25,12 @@ ohos_unittest("ani_file_environment_test") { module_out_path = "file_api/file_api" include_dirs = [ + "${file_api_path}/interfaces/kits/js/src/common", "${file_api_path}/interfaces/kits/js/src/common/file_helper", "${file_api_path}/interfaces/kits/js/src/mod_fs", - "${file_api_path}/interfaces/kits/js/src/common", + "${file_api_path}/interfaces/test/unittest/js/mod_environment/mock", "${src_path}/mod_environment", "${src_path}/mod_environment/ani", - "${file_api_path}/interfaces/test/unittest/js/mod_environment/mock", ] sources = [ @@ -124,10 +124,9 @@ ohos_unittest("ani_file_fs_mock_test") { module_out_path = "file_api/file_api" include_dirs = [ - "./include", + "${file_api_path}/interfaces/kits/js/src/common", "${file_api_path}/interfaces/kits/js/src/common/file_helper", "${file_api_path}/interfaces/kits/js/src/mod_fs", - "${file_api_path}/interfaces/kits/js/src/common", "${file_api_path}/interfaces/kits/js/src/mod_fs/class_atomicfile", "${file_api_path}/interfaces/kits/js/src/mod_fs/class_file", "${file_api_path}/interfaces/kits/js/src/mod_fs/class_randomaccessfile", @@ -198,16 +197,16 @@ ohos_unittest("ani_file_fs_mock_test") { "ability_runtime:ability_manager", "app_file_service:fileuri_native", "c_utils:utils", + "data_share:datashare_common", + "data_share:datashare_consumer", "dfs_service:distributed_file_daemon_kit_inner", "dfs_service:libdistributedfileutils", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", + "hisysevent:libhisysevent", "ipc:ipc_core", "libuv:uv", - "data_share:datashare_common", - "data_share:datashare_consumer", - "hisysevent:libhisysevent", ] libs = [ "dl" ] @@ -227,10 +226,9 @@ ohos_unittest("ani_file_fs_test") { resource_config_file = "../resource/ohos_test.xml" include_dirs = [ - "./include", + "${file_api_path}/interfaces/kits/js/src/common", "${file_api_path}/interfaces/kits/js/src/common/file_helper", "${file_api_path}/interfaces/kits/js/src/mod_fs", - "${file_api_path}/interfaces/kits/js/src/common", "${file_api_path}/interfaces/kits/js/src/mod_fs/class_watcher", "${file_api_path}/interfaces/kits/js/src/mod_fs/class_atomicfile", "${file_api_path}/interfaces/kits/js/src/mod_fs/class_file", @@ -291,15 +289,15 @@ ohos_unittest("ani_file_fs_test") { "ability_runtime:ability_manager", "app_file_service:fileuri_native", "c_utils:utils", + "data_share:datashare_common", + "data_share:datashare_consumer", "dfs_service:distributed_file_daemon_kit_inner", "dfs_service:libdistributedfileutils", "googletest:gtest_main", "hilog:libhilog", + "hisysevent:libhisysevent", "ipc:ipc_core", "libuv:uv", - "data_share:datashare_common", - "data_share:datashare_consumer", - "hisysevent:libhisysevent", ] defines = [ "private=public" ] @@ -322,11 +320,10 @@ ohos_unittest("ani_file_hash_test") { sources += ani_file_hash_core include_dirs = [ + "mock/libuv", "${file_api_path}/interfaces/kits/js/src/common", - "./include", "${file_api_path}/interfaces/kits/js/src/common/file_helper", "${file_api_path}/interfaces/kits/js/src/mod_fs", - "mock/libuv", "${file_api_path}/interfaces/kits/js/src/mod_hash", ] @@ -359,9 +356,9 @@ ohos_unittest("ani_file_securitylabel_test") { sources += ani_file_securitylabel_core include_dirs = [ + "mock/libuv", "${file_api_path}/interfaces/kits/js/src/common", "${file_api_path}/interfaces/kits/js/src/common/file_helper", - "mock/libuv", "${file_api_path}/interfaces/kits/js/src/mod_securitylabel", ] @@ -393,9 +390,9 @@ ohos_unittest("ani_file_statvfs_test") { sources += ani_file_statvfs_core include_dirs = [ + "mock/libuv", "${file_api_path}/interfaces/kits/js/src/common", "${file_api_path}/interfaces/kits/js/src/common/file_helper", - "mock/libuv", "${file_api_path}/interfaces/kits/js/src/mod_statvfs", ] -- Gitee