diff --git a/bundle.json b/bundle.json index 3b657ef6604ecfa367a1d53b36e57c3b827a4be6..f26d9f737aab1c1cebfd9426387c26a3cf74a8f2 100644 --- a/bundle.json +++ b/bundle.json @@ -39,8 +39,10 @@ "access_token", "os_account", "c_utils", + "cJSON", "image_framework", - "common_event_service" + "common_event_service", + "selinux_adapter" ] }, "build": { diff --git a/frameworks/js/napi/file_access_ext_ability/BUILD.gn b/frameworks/js/napi/file_access_ext_ability/BUILD.gn index 2efb3546db20e4726b7980cb072cdf118e850100..29981b6cd8dd5e3746a4cf10dcd07ab38e866e68 100644 --- a/frameworks/js/napi/file_access_ext_ability/BUILD.gn +++ b/frameworks/js/napi/file_access_ext_ability/BUILD.gn @@ -10,7 +10,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # 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("//build/ohos.gni") es2abc_gen_abc("gen_file_access_ext_ability_abc") { diff --git a/interfaces/inner_api/file_access/BUILD.gn b/interfaces/inner_api/file_access/BUILD.gn index 380e0c096c05d5a1d431ad281bccfe062f0bf406..fb401d917d72ad11a6e730122b4822c184fc0ecc 100644 --- a/interfaces/inner_api/file_access/BUILD.gn +++ b/interfaces/inner_api/file_access/BUILD.gn @@ -119,7 +119,6 @@ ohos_shared_library("file_access_extension_ability_kit") { } include_dirs = [ - "${commonlibrary_path}/c_utils/base/include", "${user_file_service_path}/services/native/file_access_service/include", ] @@ -141,10 +140,7 @@ ohos_shared_library("file_access_extension_ability_kit") { configs = [ ":ability_config" ] version_script = "libfile_access_extension_ability_kit.map" - public_configs = [ - ":ability_public_config", - "${ability_runtime_path}/frameworks/native/ability:ability_context_public_config", - ] + public_configs = [ ":ability_public_config" ] external_deps = [ "ability_base:want", diff --git a/interfaces/kits/native/trash/BUILD.gn b/interfaces/kits/native/trash/BUILD.gn index 9d6e47fe4db8c7782d8376e80833fe33730863d6..04a5022c8433836624305adf0859e5f4a81aa4fd 100644 --- a/interfaces/kits/native/trash/BUILD.gn +++ b/interfaces/kits/native/trash/BUILD.gn @@ -27,7 +27,6 @@ ohos_shared_library("trash") { include_dirs = [ "include", - "${file_api_path}/interfaces/kits/rust/include", "${user_file_service_path}/utils", ] diff --git a/interfaces/kits/picker/BUILD.gn b/interfaces/kits/picker/BUILD.gn index 3ca1c2aad3f655a94cbb067f3b590cc744e9a589..3ffd40376950c6673a6ac42fc0e623a0cb4655d0 100644 --- a/interfaces/kits/picker/BUILD.gn +++ b/interfaces/kits/picker/BUILD.gn @@ -11,29 +11,19 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//build/config/components/ets_frontend/es2abc_config.gni") import("//build/ohos.gni") import("//build/ohos/ace/ace.gni") -import("../../../../../../arkcompiler/ets_frontend/es2panda/es2abc_config.gni") import("../../../filemanagement_aafwk.gni") # compile .js to .abc. -action("gen_picker_abc") { - visibility = [ ":*" ] - script = "../../../../../../arkcompiler/ets_frontend/es2panda/scripts/generate_js_bytecode.py" - - args = [ - "--src-js", - rebase_path("picker.js"), - "--dst-file", - rebase_path(target_out_dir + "/picker.abc"), - "--frontend-tool-path", - rebase_path("${es2abc_build_path}"), - "--module", - ] - deps = - [ "../../../../../../arkcompiler/ets_frontend/es2panda:es2panda_build" ] - inputs = [ "picker.js" ] - outputs = [ target_out_dir + "/picker.abc" ] + +es2abc_gen_abc("gen_picker_abc") { + src_js = rebase_path("picker.js") + dst_file = rebase_path(target_out_dir + "/picker.abc") + in_puts = [ "picker.js" ] + out_puts = [ target_out_dir + "/picker.abc" ] + extra_args = [ "--module" ] } base_output_path = get_label_info(":picker_js", "target_out_dir") diff --git a/test/fuzztest/externalfileaccess_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccess_fuzzer/BUILD.gn index 999941de499aabd2a866c5ed19a408be725df7e1..96627b20f064872894760b622a9f3f08078ac871 100644 --- a/test/fuzztest/externalfileaccess_fuzzer/BUILD.gn +++ b/test/fuzztest/externalfileaccess_fuzzer/BUILD.gn @@ -48,11 +48,13 @@ ohos_fuzztest("ExternalFileAccessFuzzTest") { "access_token:libnativetoken", "access_token:libtoken_setproc", "bundle_framework:appexecfwk_core", + "cJSON:cjson_static", "c_utils:utils", "hilog:libhilog", "ipc:ipc_core", "ipc:rpc", "samgr:samgr_proxy", + "selinux_adapter:librestorecon", ] cflags = [ diff --git a/test/fuzztest/externalfileaccessaccess_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccessaccess_fuzzer/BUILD.gn index b5ff597af41df12f5f61bcc20fdb9017421549a5..366750a83a4268a0af3f9c766695e0211d82e527 100644 --- a/test/fuzztest/externalfileaccessaccess_fuzzer/BUILD.gn +++ b/test/fuzztest/externalfileaccessaccess_fuzzer/BUILD.gn @@ -49,13 +49,16 @@ ohos_fuzztest("ExternalFileAccessAccessFuzzTest") { "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "cJSON:cjson_static", "c_utils:utils", "hilog:libhilog", "hitrace:hitrace_meter", "image_framework:image_native", "ipc:ipc_core", + "ipc:ipc_napi", "napi:ace_napi", "samgr:samgr_proxy", + "selinux_adapter:librestorecon", ] } diff --git a/test/fuzztest/externalfileaccesscreatefile_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccesscreatefile_fuzzer/BUILD.gn index 08b055d5e0dbf2fb1c692070fbfc7a8272ac848c..f4081b5942d1f57f8acaf4b3a3bc00de56b5cb7d 100644 --- a/test/fuzztest/externalfileaccesscreatefile_fuzzer/BUILD.gn +++ b/test/fuzztest/externalfileaccesscreatefile_fuzzer/BUILD.gn @@ -48,13 +48,16 @@ ohos_fuzztest("ExternalFileAccessCreateFileFuzzTest") { "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "cJSON:cjson_static", "c_utils:utils", "hilog:libhilog", "hitrace:hitrace_meter", "image_framework:image_native", "ipc:ipc_core", + "ipc:ipc_napi", "napi:ace_napi", "samgr:samgr_proxy", + "selinux_adapter:librestorecon", ] } diff --git a/test/fuzztest/externalfileaccessdelete_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccessdelete_fuzzer/BUILD.gn index 5d7bdcb813066747511befb9ff14db5eed77bf0d..b7716541aa8dcae603f3f328dd5c1044cee2da5c 100644 --- a/test/fuzztest/externalfileaccessdelete_fuzzer/BUILD.gn +++ b/test/fuzztest/externalfileaccessdelete_fuzzer/BUILD.gn @@ -49,13 +49,16 @@ ohos_fuzztest("ExternalFileAccessDeleteFuzzTest") { "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "cJSON:cjson_static", "c_utils:utils", "hilog:libhilog", "hitrace:hitrace_meter", "image_framework:image_native", "ipc:ipc_core", + "ipc:ipc_napi", "napi:ace_napi", "samgr:samgr_proxy", + "selinux_adapter:librestorecon", ] } diff --git a/test/fuzztest/externalfileaccessgetfileinfofromrelativepath_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccessgetfileinfofromrelativepath_fuzzer/BUILD.gn index bba16afa88b11c86f44ff47f614d0510a6c3695c..705fdcabf1a76b00cd39652a83966cc08e800be0 100644 --- a/test/fuzztest/externalfileaccessgetfileinfofromrelativepath_fuzzer/BUILD.gn +++ b/test/fuzztest/externalfileaccessgetfileinfofromrelativepath_fuzzer/BUILD.gn @@ -48,13 +48,16 @@ ohos_fuzztest("ExternalFileAccessGetFileInfoFromRelativePathFuzzTest") { "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "cJSON:cjson_static", "c_utils:utils", "hilog:libhilog", "hitrace:hitrace_meter", "image_framework:image_native", "ipc:ipc_core", + "ipc:ipc_napi", "napi:ace_napi", "samgr:samgr_proxy", + "selinux_adapter:librestorecon", ] } diff --git a/test/fuzztest/externalfileaccessgetfileinfofromuri_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccessgetfileinfofromuri_fuzzer/BUILD.gn index 9e09df228e88808b8955808c48e042295d6c5c1b..f5ecec9a32a5f4a4a6aeabb7ccf7bb38fcd7d064 100644 --- a/test/fuzztest/externalfileaccessgetfileinfofromuri_fuzzer/BUILD.gn +++ b/test/fuzztest/externalfileaccessgetfileinfofromuri_fuzzer/BUILD.gn @@ -48,13 +48,16 @@ ohos_fuzztest("ExternalFileAccessGetFileInfoFromUriFuzzTest") { "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "cJSON:cjson_static", "c_utils:utils", "hilog:libhilog", "hitrace:hitrace_meter", "image_framework:image_native", "ipc:ipc_core", + "ipc:ipc_napi", "napi:ace_napi", "samgr:samgr_proxy", + "selinux_adapter:librestorecon", ] } diff --git a/test/fuzztest/externalfileaccessgetroots_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccessgetroots_fuzzer/BUILD.gn index 29428da94d301c080bb6905bc7b88baec589bfd3..57ee244ddcfc3254a06c595528fe3d8bd3390dc6 100644 --- a/test/fuzztest/externalfileaccessgetroots_fuzzer/BUILD.gn +++ b/test/fuzztest/externalfileaccessgetroots_fuzzer/BUILD.gn @@ -48,13 +48,16 @@ ohos_fuzztest("ExternalFileAccessGetRootsFuzzTest") { "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "cJSON:cjson_static", "c_utils:utils", "hilog:libhilog", "hitrace:hitrace_meter", "image_framework:image_native", "ipc:ipc_core", + "ipc:ipc_napi", "napi:ace_napi", "samgr:samgr_proxy", + "selinux_adapter:librestorecon", ] } diff --git a/test/fuzztest/externalfileaccesslistfile_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccesslistfile_fuzzer/BUILD.gn index a935c0b4bad5f96488dba868e3347767c387e3ec..b09c02ec4183c0df202331c12d4713869d12324d 100644 --- a/test/fuzztest/externalfileaccesslistfile_fuzzer/BUILD.gn +++ b/test/fuzztest/externalfileaccesslistfile_fuzzer/BUILD.gn @@ -48,13 +48,16 @@ ohos_fuzztest("ExternalFileAccessListFileFuzzTest") { "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "cJSON:cjson_static", "c_utils:utils", "hilog:libhilog", "hitrace:hitrace_meter", "image_framework:image_native", "ipc:ipc_core", + "ipc:ipc_napi", "napi:ace_napi", "samgr:samgr_proxy", + "selinux_adapter:librestorecon", ] } diff --git a/test/fuzztest/externalfileaccessmkdir_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccessmkdir_fuzzer/BUILD.gn index 40d302d3136e38277dfaa3e4a8401a4d4a299975..0b0a42fd07e20609041bfe8300bb461026db5c6f 100644 --- a/test/fuzztest/externalfileaccessmkdir_fuzzer/BUILD.gn +++ b/test/fuzztest/externalfileaccessmkdir_fuzzer/BUILD.gn @@ -49,13 +49,16 @@ ohos_fuzztest("ExternalFileAccessMkdirFuzzTest") { "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "cJSON:cjson_static", "c_utils:utils", "hilog:libhilog", "hitrace:hitrace_meter", "image_framework:image_native", "ipc:ipc_core", + "ipc:ipc_napi", "napi:ace_napi", "samgr:samgr_proxy", + "selinux_adapter:librestorecon", ] } diff --git a/test/fuzztest/externalfileaccessmove_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccessmove_fuzzer/BUILD.gn index c04b0e071fb909d1b4cc22679325ee069205ed93..e845a8ac9e066f8a55a86ee4b8b83a30a69cdfde 100644 --- a/test/fuzztest/externalfileaccessmove_fuzzer/BUILD.gn +++ b/test/fuzztest/externalfileaccessmove_fuzzer/BUILD.gn @@ -49,13 +49,16 @@ ohos_fuzztest("ExternalFileAccessMoveFuzzTest") { "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "cJSON:cjson_static", "c_utils:utils", "hilog:libhilog", "hitrace:hitrace_meter", "image_framework:image_native", "ipc:ipc_core", + "ipc:ipc_napi", "napi:ace_napi", "samgr:samgr_proxy", + "selinux_adapter:librestorecon", ] } diff --git a/test/fuzztest/externalfileaccessopenfile_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccessopenfile_fuzzer/BUILD.gn index ce879f44e6e4640e2d2a40e50425570d227e5b7b..ba64c2d079d184be2702275bf329598f82ebcc46 100644 --- a/test/fuzztest/externalfileaccessopenfile_fuzzer/BUILD.gn +++ b/test/fuzztest/externalfileaccessopenfile_fuzzer/BUILD.gn @@ -48,13 +48,16 @@ ohos_fuzztest("ExternalFileAccessOpenFileFuzzTest") { "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "cJSON:cjson_static", "c_utils:utils", "hilog:libhilog", "hitrace:hitrace_meter", "image_framework:image_native", "ipc:ipc_core", + "ipc:ipc_napi", "napi:ace_napi", "samgr:samgr_proxy", + "selinux_adapter:librestorecon", ] } diff --git a/test/fuzztest/externalfileaccessrename_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccessrename_fuzzer/BUILD.gn index 26796a8533c9eb49af2fa3888250f2b227fc9d58..2eb208d1c1bc87fd8a98f886a594f0df67686a5f 100644 --- a/test/fuzztest/externalfileaccessrename_fuzzer/BUILD.gn +++ b/test/fuzztest/externalfileaccessrename_fuzzer/BUILD.gn @@ -49,13 +49,16 @@ ohos_fuzztest("ExternalFileAccessRenameFuzzTest") { "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "cJSON:cjson_static", "c_utils:utils", "hilog:libhilog", "hitrace:hitrace_meter", "image_framework:image_native", "ipc:ipc_core", + "ipc:ipc_napi", "napi:ace_napi", "samgr:samgr_proxy", + "selinux_adapter:librestorecon", ] } diff --git a/test/fuzztest/externalfileaccessscanfile_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccessscanfile_fuzzer/BUILD.gn index 7452eeb0b44e5c201acc3a782bb34e66a5d72fb3..2f1d93f499c976ad8675d0a7344160bee7062e5c 100644 --- a/test/fuzztest/externalfileaccessscanfile_fuzzer/BUILD.gn +++ b/test/fuzztest/externalfileaccessscanfile_fuzzer/BUILD.gn @@ -48,13 +48,16 @@ ohos_fuzztest("ExternalFileAccessScanFileFuzzTest") { "access_token:libtoken_setproc", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", + "cJSON:cjson_static", "c_utils:utils", "hilog:libhilog", "hitrace:hitrace_meter", "image_framework:image_native", "ipc:ipc_core", + "ipc:ipc_napi", "napi:ace_napi", "samgr:samgr_proxy", + "selinux_adapter:librestorecon", ] } diff --git a/test/fuzztest/fileaccessextbaseproxy_fuzzer/BUILD.gn b/test/fuzztest/fileaccessextbaseproxy_fuzzer/BUILD.gn index a5d06f8fb44f14a586d76452085efd6cc4a988b3..66f6d2b82ef7ebd050a47a4d853baf1d1a5c9874 100644 --- a/test/fuzztest/fileaccessextbaseproxy_fuzzer/BUILD.gn +++ b/test/fuzztest/fileaccessextbaseproxy_fuzzer/BUILD.gn @@ -50,11 +50,13 @@ ohos_fuzztest("FileAccessExtBaseProxyFuzzTest") { "access_token:libnativetoken", "access_token:libtoken_setproc", "bundle_framework:appexecfwk_core", + "cJSON:cjson_static", "c_utils:utils", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", + "selinux_adapter:librestorecon", "samgr:samgr_proxy", ] diff --git a/test/fuzztest/fileaccessextconnection_fuzzer/BUILD.gn b/test/fuzztest/fileaccessextconnection_fuzzer/BUILD.gn index 6299ceedaede81c1b15ff586c23a9088722b3fa2..73d98a82617d29a27c3023a6f60ae2261f9336b3 100644 --- a/test/fuzztest/fileaccessextconnection_fuzzer/BUILD.gn +++ b/test/fuzztest/fileaccessextconnection_fuzzer/BUILD.gn @@ -48,6 +48,7 @@ ohos_fuzztest("FileAccessExtConnectionFuzzTest") { "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "ipc:ipc_napi", "safwk:system_ability_fwk", ] diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 26c9d9c7934f3b9a0d0aa6d6172b85f540aabdb7..618ca1d9ca090e2891f510fc91a8c456007a8954 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -105,6 +105,7 @@ ohos_unittest("external_file_access_basic_test") { "access_token:libnativetoken", "access_token:libtoken_setproc", "bundle_framework:appexecfwk_core", + "cJSON:cjson_static", "c_utils:utils", "googletest:gmock_main", "googletest:gtest_main", @@ -112,6 +113,7 @@ ohos_unittest("external_file_access_basic_test") { "ipc:ipc_core", "ipc:rpc", "samgr:samgr_proxy", + "selinux_adapter:librestorecon", ] defines = [ "private=public" ] @@ -161,6 +163,7 @@ ohos_unittest("external_file_access_management_test") { "access_token:libnativetoken", "access_token:libtoken_setproc", "bundle_framework:appexecfwk_core", + "cJSON:cjson_static", "c_utils:utils", "googletest:gmock_main", "googletest:gtest_main", @@ -168,6 +171,7 @@ ohos_unittest("external_file_access_management_test") { "ipc:ipc_core", "ipc:rpc", "samgr:samgr_proxy", + "selinux_adapter:librestorecon", ] defines = [ "private=public" ] @@ -213,6 +217,7 @@ ohos_unittest("external_file_access_notify_test") { "access_token:libnativetoken", "access_token:libtoken_setproc", "bundle_framework:appexecfwk_core", + "cJSON:cjson_static", "c_utils:utils", "googletest:gmock_main", "googletest:gtest_main", @@ -220,6 +225,7 @@ ohos_unittest("external_file_access_notify_test") { "ipc:ipc_core", "ipc:rpc", "samgr:samgr_proxy", + "selinux_adapter:librestorecon", ] } @@ -263,12 +269,14 @@ ohos_unittest("abnormal_file_access_test") { "access_token:libnativetoken", "access_token:libtoken_setproc", "bundle_framework:appexecfwk_core", + "cJSON:cjson_static", "c_utils:utils", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", + "selinux_adapter:librestorecon", ] } @@ -307,13 +315,16 @@ ohos_unittest("file_access_ext_stub_impl_test") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", + "cJSON:cjson_static", "c_utils:utils", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "ipc:ipc_napi", "napi:ace_napi", + "selinux_adapter:librestorecon", ] use_exceptions = true @@ -370,6 +381,7 @@ ohos_unittest("js_file_access_ext_ability_test") { "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", + "ipc:ipc_napi", "napi:ace_napi", "os_account:os_account_innerkits", ]