From 4ff72b5673ad50645c5fefa9be3d2eae6e0a915c Mon Sep 17 00:00:00 2001 From: zhangxiaoliang25 Date: Mon, 24 Apr 2023 12:56:01 +0000 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E6=95=B4=E6=94=B9=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8f03337d666a032f34eb8310f7d2f02981b72459 --- filemanagement_aafwk.gni | 4 ++++ frameworks/js/napi/file_access_module/BUILD.gn | 6 +++--- .../js/napi/file_extension_info_module/BUILD.gn | 6 +++--- interfaces/inner_api/file_access/BUILD.gn | 9 +++------ .../fuzztest/externalfileaccess_fuzzer/BUILD.gn | 8 +++----- .../medialibraryfileaccess_fuzzer/BUILD.gn | 9 ++++----- test/unittest/BUILD.gn | 17 ++++++++--------- 7 files changed, 28 insertions(+), 31 deletions(-) diff --git a/filemanagement_aafwk.gni b/filemanagement_aafwk.gni index 7cb8aa91..b3b8a8ee 100644 --- a/filemanagement_aafwk.gni +++ b/filemanagement_aafwk.gni @@ -18,3 +18,7 @@ ability_runtime_services_path = "${ability_runtime_path}/services" ability_runtime_napi_path = "${ability_runtime_path}/frameworks/js/napi" access_token_path = "//base/security/access_token" file_api_path = "//foundation/filemanagement/file_api" +BASE_DIR = "//foundation/filemanagement/user_file_service" + + +distributedfile = "//foundation/distributeddatamgr/distributedfile" diff --git a/frameworks/js/napi/file_access_module/BUILD.gn b/frameworks/js/napi/file_access_module/BUILD.gn index 525aa5e5..dac8b9c5 100644 --- a/frameworks/js/napi/file_access_module/BUILD.gn +++ b/frameworks/js/napi/file_access_module/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/ohos.gni") -BASE_DIR = "//foundation/filemanagement/user_file_service" +import("//foundation/filemanagement/user_file_service/filemanagement_aafwk.gni") ohos_shared_library("fileaccess") { subsystem_name = "filemanagement" @@ -26,7 +26,7 @@ ohos_shared_library("fileaccess") { "${BASE_DIR}/frameworks/js/napi/file_access_module/file_info", "${BASE_DIR}/frameworks/js/napi/file_access_module/root_info", "${BASE_DIR}/utils", - "//foundation/filemanagement/file_api/interfaces/kits/js/src/common", + "${file_api_path}/interfaces/kits/js/src/common", ] sources = [ @@ -43,7 +43,6 @@ ohos_shared_library("fileaccess") { deps = [ "${BASE_DIR}/interfaces/inner_api/file_access:file_access_extension_ability_kit", - "//foundation/ability/ability_runtime/frameworks/js/napi/inner/napi_common:napi_common", ] external_deps = [ @@ -56,5 +55,6 @@ ohos_shared_library("fileaccess") { "file_api:filemgmt_libn", "hiviewdfx_hilog_native:libhilog", "multimedia_image_framework:image", + "ability_runtime:napi_common", ] } diff --git a/frameworks/js/napi/file_extension_info_module/BUILD.gn b/frameworks/js/napi/file_extension_info_module/BUILD.gn index 6ef48df6..d3e7d8aa 100644 --- a/frameworks/js/napi/file_extension_info_module/BUILD.gn +++ b/frameworks/js/napi/file_extension_info_module/BUILD.gn @@ -12,9 +12,9 @@ # limitations under the License. import("//build/ohos.gni") +import("//foundation/filemanagement/user_file_service/filemanagement_aafwk.gni") -UFS_BASE_PATH = "//foundation/filemanagement/user_file_service" - +UFS_BASE_PATH="${BASE_DIR}" ohos_shared_library("fileextensioninfo") { subsystem_name = "filemanagement" part_name = "user_file_service" @@ -26,7 +26,6 @@ ohos_shared_library("fileextensioninfo") { "${UFS_BASE_PATH}/interfaces/inner_api/file_access/include/notify", "${UFS_BASE_PATH}/frameworks/js/napi/common", "${UFS_BASE_PATH}/utils", - "//foundation/ability/ability_base/interfaces/kits/native/uri/include", ] sources = [ @@ -38,5 +37,6 @@ ohos_shared_library("fileextensioninfo") { "c_utils:utils", "file_api:filemgmt_libn", "hiviewdfx_hilog_native:libhilog", + "ability_base:want", ] } diff --git a/interfaces/inner_api/file_access/BUILD.gn b/interfaces/inner_api/file_access/BUILD.gn index 4cb77a41..46d170c0 100644 --- a/interfaces/inner_api/file_access/BUILD.gn +++ b/interfaces/inner_api/file_access/BUILD.gn @@ -14,7 +14,6 @@ import("//build/ohos.gni") import("//foundation/filemanagement/user_file_service/filemanagement_aafwk.gni") -BASE_DIR = "//foundation/filemanagement/user_file_service" config("ability_config") { visibility = [ ":*" ] @@ -27,10 +26,7 @@ config("ability_config") { "${ability_runtime_kits_path}/appkit/native/app/include", "${ability_runtime_napi_path}/inner/napi_common", "${access_token_path}/interfaces/innerkits/accesstoken/include", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", - "//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_base/include", - "//foundation/distributeddatamgr/distributedfile/interfaces/kits/js/src/common", + "${distributedfile}/interfaces/kits/js/src/common", ] cflags = [] @@ -54,7 +50,6 @@ config("ability_public_config") { ohos_shared_library("file_access_extension_ability_kit") { include_dirs = [ "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context", - "//foundation/communication/ipc/ipc/native/src/napi/include", "${file_api_path}/utils/filemgmt_libn/include", ] @@ -101,6 +96,7 @@ ohos_shared_library("file_access_extension_ability_kit") { "multimedia_image_framework:image_native", "napi:ace_napi", "samgr:samgr_proxy", + "bundle_framework:appexecfwk_base", ] subsystem_name = "filemanagement" @@ -123,6 +119,7 @@ ohos_shared_library("file_access_extension_ability_module") { "ability_runtime:runtime", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "bundle_framework:appexecfwk_base", ] relative_install_dir = "extensionability/" diff --git a/test/fuzztest/externalfileaccess_fuzzer/BUILD.gn b/test/fuzztest/externalfileaccess_fuzzer/BUILD.gn index c2b1afb6..ef579121 100644 --- a/test/fuzztest/externalfileaccess_fuzzer/BUILD.gn +++ b/test/fuzztest/externalfileaccess_fuzzer/BUILD.gn @@ -15,7 +15,6 @@ import("//build/config/features.gni") import("//build/test.gni") import("//foundation/filemanagement/user_file_service/filemanagement_aafwk.gni") -BASE_DIR = "//foundation/filemanagement/user_file_service" ##############################fuzztest########################################## ohos_fuzztest("ExternalFileAccessFuzzTest") { @@ -23,9 +22,8 @@ ohos_fuzztest("ExternalFileAccessFuzzTest") { fuzz_config_file = "${BASE_DIR}/test/fuzztest/externalfileaccess_fuzzer" include_dirs = [ - "//foundation/ability/ability_runtime/frameworks/kits/appkit/native/ability_runtime/context", "${BASE_DIR}/interfaces/inner_api/file_access/include", - "//foundation/distributeddatamgr/distributedfile/interfaces/kits/js/src/common", + "{distributedfile}/interfaces/kits/js/src/common", "${BASE_DIR}/utils", ] @@ -36,8 +34,7 @@ ohos_fuzztest("ExternalFileAccessFuzzTest") { "${BASE_DIR}/interfaces/inner_api/file_access:file_access_extension_ability_kit", "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native", "${ability_runtime_path}/frameworks/native/appkit:app_context", - "//base/security/access_token/frameworks/accesstoken:accesstoken_communication_adapter_cxx", - "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", + "${access_token_path}/frameworks/accesstoken:accesstoken_communication_adapter_cxx", ] external_deps = [ @@ -55,6 +52,7 @@ ohos_fuzztest("ExternalFileAccessFuzzTest") { "ipc:ipc_core", "ipc_js:rpc", "samgr:samgr_proxy", + "access_token:libtoken_setproc", ] cflags = [ diff --git a/test/fuzztest/medialibraryfileaccess_fuzzer/BUILD.gn b/test/fuzztest/medialibraryfileaccess_fuzzer/BUILD.gn index e0f3e084..1293f30a 100644 --- a/test/fuzztest/medialibraryfileaccess_fuzzer/BUILD.gn +++ b/test/fuzztest/medialibraryfileaccess_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/test.gni") import("//foundation/filemanagement/user_file_service/filemanagement_aafwk.gni") -BASE_DIR = "//foundation/filemanagement/user_file_service" + ##############################fuzztest########################################## ohos_fuzztest("MedialibraryFileAccessFuzzTest") { @@ -23,9 +23,8 @@ ohos_fuzztest("MedialibraryFileAccessFuzzTest") { fuzz_config_file = "${BASE_DIR}/test/fuzztest/medialibraryfileaccess_fuzzer" include_dirs = [ - "//foundation/ability/ability_runtime/frameworks/kits/appkit/native/ability_runtime/context", "${BASE_DIR}/interfaces/inner_api/file_access/include", - "//foundation/distributeddatamgr/distributedfile/interfaces/kits/js/src/common", + "${distributedfile}/interfaces/kits/js/src/common", "${BASE_DIR}/utils", ] @@ -36,8 +35,7 @@ ohos_fuzztest("MedialibraryFileAccessFuzzTest") { "${BASE_DIR}/interfaces/inner_api/file_access:file_access_extension_ability_kit", "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native", "${ability_runtime_path}/frameworks/native/appkit:app_context", - "//base/security/access_token/frameworks/accesstoken:accesstoken_communication_adapter_cxx", - "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", + "${access_token_path}/frameworks/accesstoken:accesstoken_communication_adapter_cxx", ] external_deps = [ @@ -55,6 +53,7 @@ ohos_fuzztest("MedialibraryFileAccessFuzzTest") { "ipc:ipc_core", "ipc_js:rpc", "samgr:samgr_proxy", + "access_token:libtoken_setproc", ] cflags = [ diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index cab8c725..a83863fc 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -13,17 +13,17 @@ import("//build/test.gni") import("//foundation/filemanagement/user_file_service/filemanagement_aafwk.gni") -BASE_DIR = "//foundation/filemanagement/user_file_service" + ohos_unittest("medialibrary_file_access_test") { module_out_path = "filemanagement/user_file_service" sources = [ "medialibrary_file_access_test.cpp" ] include_dirs = [ - "//foundation/ability/ability_runtime/frameworks/kits/appkit/native/ability_runtime/context", "${BASE_DIR}/interfaces/inner_api/file_access/include", "//third_party/googletest/googlemock/include/gmock", - "//foundation/distributeddatamgr/distributedfile/interfaces/kits/js/src/common", + "${access_token_path}/frameworks/accesstoken:accesstoken_communication_adapter_cxx/", + "${distributedfile}/interfaces/kits/js/src/common", ] configs = [ "//build/config/compiler:exceptions" ] @@ -32,8 +32,6 @@ ohos_unittest("medialibrary_file_access_test") { "${BASE_DIR}/interfaces/inner_api/file_access:file_access_extension_ability_kit", "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native", "${ability_runtime_path}/frameworks/native/appkit:app_context", - "//base/security/access_token/frameworks/accesstoken:accesstoken_communication_adapter_cxx", - "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", "//third_party/googletest:gmock_main", ] @@ -52,6 +50,7 @@ ohos_unittest("medialibrary_file_access_test") { "ipc_js:rpc", "multimedia_image_framework:image_native", "samgr:samgr_proxy", + "access_token:libtoken_setproc", ] resource_config_file = "${BASE_DIR}/test/unittest/resources/ohos_test.xml" @@ -64,9 +63,8 @@ ohos_unittest("external_file_access_test") { include_dirs = [ "//third_party/googletest/googlemock/include/gmock", - "//foundation/ability/ability_runtime/frameworks/kits/appkit/native/ability_runtime/context", "${BASE_DIR}/interfaces/inner_api/file_access/include", - "//foundation/distributeddatamgr/distributedfile/interfaces/kits/js/src/common", + "${distributedfile}/interfaces/kits/js/src/common", ] configs = [ "//build/config/compiler:exceptions" ] @@ -75,8 +73,7 @@ ohos_unittest("external_file_access_test") { "${BASE_DIR}/interfaces/inner_api/file_access:file_access_extension_ability_kit", "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native", "${ability_runtime_path}/frameworks/native/appkit:app_context", - "//base/security/access_token/frameworks/accesstoken:accesstoken_communication_adapter_cxx", - "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", + "${access_token_path}/frameworks/accesstoken:accesstoken_communication_adapter_cxx", "//third_party/googletest:gmock_main", ] @@ -94,6 +91,7 @@ ohos_unittest("external_file_access_test") { "ipc:ipc_core", "ipc_js:rpc", "samgr:samgr_proxy", + "access_token:libtoken_setproc", ] } @@ -105,3 +103,4 @@ group("user_file_service_unit_test") { ":medialibrary_file_access_test", ] } + -- Gitee