openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_ability_runtime synced 2024-11-23 23:30:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:openharmony/ability_ability_runtime into master

Browse Source 
Signed-off-by: jerry <sijunjie@huawei.com>
This commit is contained in:
jerry 2023-04-25 10:38:54 +00:00 committed by Gitee
commit 06ec21c092
47 changed files with 164 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ability_runtime.gni
View File

@ -44,10 +44,16 @@ eventhandler_path = "//base/notification/eventhandler"
hiviewdfx_path = "//base/hiviewdfx/hiview"
hilog_path = "//base/hiviewdfx/hilog"
webview_path = "//base/web/webview"
appspawn_path = "//base/startup/appspawn"
resource_management_path = "//base/global/resource_management"
common_event_service_path = "//base/notification/common_event_service"
safwk_path = "//utils/system/safwk"
user_file_service_innerkits_path =
"//foundation/filemanagement/user_file_service/interfaces/inner_api"
resourceschedule_path = "//foundation/resourceschedule"
device_usage_statistics_path =
"//foundation/resourceschedule/device_usage_statistics"
device_manager_path = "//foundation/distributedhardware/device_manager"
graphic_2d_path = "//foundation/graphic/graphic_2d"
declare_args() {
background_task_mgr_continuous_task_enable = true

8
frameworks/native/ability/BUILD.gn
View File

@ -17,11 +17,11 @@ import("//foundation/ability/ability_runtime/ability_runtime.gni")
config("ability_context_public_config") {
visibility = [ ":*" ]
visibility += [
"${ability_runtime_native_path}/ability/*",
"${ability_runtime_test_path}/fuzztest/connectability_fuzzer/*",
"${ability_runtime_test_path}/fuzztest/disconnectability_fuzzer/*",
"${user_file_service_innerkits_path}/file_access/*",
"//base/print/print_fwk/frameworks/kits/extension/*",
"//foundation/ability/ability_runtime/frameworks/native/ability/*",
"//foundation/ability/ability_runtime/test/fuzztest/connectability_fuzzer/*",
"//foundation/ability/ability_runtime/test/fuzztest/disconnectability_fuzzer/*",
"//foundation/filemanagement/user_file_service/interfaces/inner_api/file_access/*",
]
include_dirs = [
"${ability_base_kits_path}/extractortool/include",

16
frameworks/native/ability/native/BUILD.gn
View File

@ -18,13 +18,13 @@ import("//foundation/distributeddatamgr/relational_store/relational_store.gni")
config("ability_config") {
visibility = [ ":*" ]
visibility += [
"${ability_runtime_native_path}/ability/native/*",
"${ability_runtime_test_path}/*",
"${distributeddatamgr_path}/data_share/interfaces/inner_api/*",
"${user_file_service_innerkits_path}/file_access/*",
"//base/inputmethod/imf/frameworks/kits/extension/*",
"//base/print/print_fwk/frameworks/kits/extension/*",
"//base/theme/wallpaper_mgr/frameworks/kits/extension/*",
"//foundation/ability/ability_runtime/frameworks/native/ability/native/*",
"//foundation/ability/ability_runtime/test/*",
"//foundation/distributeddatamgr/data_share/interfaces/inner_api/*",
"//foundation/filemanagement/user_file_service/interfaces/inner_api/file_access/*",
]
include_dirs = [
"${ability_runtime_path}/interfaces/kits/native/ability/native",
@ -71,8 +71,8 @@ config("ability_config") {
config("ability_public_config") {
visibility = [ ":*" ]
visibility += [
"//foundation/ability/ability_runtime/frameworks/js/napi/inner/*",
"//foundation/ability/ability_runtime/test/fuzztest/*",
"${ability_runtime_napi_path}/inner/*",
"${ability_runtime_test_path}/fuzztest/*",
]
include_dirs = [
"${ability_runtime_napi_path}/inner/napi_ability_common",
@ -285,6 +285,8 @@ ohos_shared_library("abilitykit_native") {
"input:libmmi-client",
"ipc:ipc_core",
"ipc:ipc_napi_common",
"ipc_js:rpc",
"napi:ace_napi",
"relational_store:native_rdb",
"resource_management:global_resmgr",
"samgr:samgr_proxy",
@ -308,8 +310,6 @@ ohos_shared_library("abilitykit_native") {
"${ability_runtime_napi_path}/inner/napi_common:napi_common",
"//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
"//base/startup/init/interfaces/innerkits:libbegetutil",
"//foundation/arkui/napi:ace_napi",
"//foundation/communication/ipc/interfaces/kits/js/napi:rpc",
]
if (ability_runtime_graphics) {

5
frameworks/native/appkit/BUILD.gn
View File

@ -126,7 +126,7 @@ ohos_shared_library("appkit_native") {
"${ability_runtime_native_path}/appkit:app_context",
"${ability_runtime_native_path}/appkit:app_context_utils",
"${ability_runtime_services_path}/abilitymgr:abilityms",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
"${graphic_2d_path}/rosen/modules/render_service_client:librender_service_client",
]
external_deps = [
@ -337,8 +337,7 @@ ohos_shared_library("appkit_delegator") {
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
]
public_deps = [ "//foundation/arkui/napi:ace_napi" ]
public_deps = [ "${arkui_path}/napi:ace_napi" ]
if (ability_runtime_graphics) {
deps += [ "//third_party/icu/icu4c:shared_icuuc" ]

10
frameworks/simulator/BUILD.gn
View File

@ -12,6 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
if (is_mac) {
dylib_suffix = ".dylib"
@ -95,13 +96,12 @@ ohos_copy("copy_ability_simulator") {
sources +=
[ out_path + "/ability/simulator/libability_simulator" + dylib_suffix ]
deps += [ "//foundation/arkui/napi:ace_napi" ]
out_path = get_label_info("//foundation/arkui/napi:ace_napi", "root_out_dir")
external_deps = [ "napi:ace_napi" ]
out_path = get_label_info("${arkui_path}/napi:ace_napi", "root_out_dir")
sources += [ out_path + "/arkui/napi/libace_napi" + dylib_suffix ]
deps += [ "//foundation/arkui/napi:ace_napi_ark" ]
out_path =
get_label_info("//foundation/arkui/napi:ace_napi_ark", "root_out_dir")
deps += [ "${arkui_path}/napi:ace_napi_ark" ]
out_path = get_label_info("${arkui_path}/napi:ace_napi_ark", "root_out_dir")
sources += [ out_path + "/arkui/napi/libace_napi_ark" + dylib_suffix ]
deps += [ "//arkcompiler/ets_runtime:libark_jsruntime" ]

20
frameworks/simulator/ability_simulator/BUILD.gn
View File

@ -61,14 +61,14 @@ ohos_shared_library("ability_simulator") {
cflags = [ "-std=c++17" ]
include_dirs = [
"//foundation/ability/ability_runtime/frameworks/native/runtime",
"//foundation/ability/ability_runtime/interfaces/inner_api/runtime/include",
"${ability_runtime_native_path}/runtime",
"${ability_runtime_innerkits_path}/runtime/include",
]
sources = [
"//foundation/ability/ability_runtime/frameworks/native/runtime/js_console_log.cpp",
"//foundation/ability/ability_runtime/frameworks/native/runtime/js_module_searcher.cpp",
"//foundation/ability/ability_runtime/frameworks/native/runtime/js_runtime_utils.cpp",
"${ability_runtime_native_path}/runtime/js_console_log.cpp",
"${ability_runtime_native_path}/runtime/js_module_searcher.cpp",
"${ability_runtime_native_path}/runtime/js_runtime_utils.cpp",
"src/js_timer.cpp",
"src/simulator.cpp",
]
@ -81,15 +81,17 @@ ohos_shared_library("ability_simulator") {
deps = [
":gen_obj_src_js_mock_abc",
"${ability_runtime_native_path}/runtime:string_utils",
"${ability_runtime_path}/frameworks/simulator/osal:simulator_osal",
"${arkui_path}/napi:ace_napi_ark",
"${hilog_path}/interfaces/native/innerkits:libhilog_$platform",
"//arkcompiler/toolchain/inspector:ark_debugger",
"//arkcompiler/toolchain/tooling:libark_ecma_debugger",
"//foundation/ability/ability_runtime/frameworks/simulator/osal:simulator_osal",
"//foundation/arkui/napi:ace_napi",
"//foundation/arkui/napi:ace_napi_ark",
]
external_deps = [ "ets_runtime:libark_jsruntime" ]
external_deps = [
"ets_runtime:libark_jsruntime",
"napi:ace_napi",
]
part_name = "simulator"
subsystem_name = "ability"

7
frameworks/simulator/napi_module/ability/BUILD.gn
View File

@ -12,11 +12,12 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
import(
"//foundation/ability/ability_runtime/frameworks/simulator/build/ability_simulator.gni")
gen_js_src_binary("ability") {
js_source = "//foundation/ability/ability_runtime/frameworks/js/napi/ability/ability.js"
js_source = "${ability_runtime_napi_path}/ability/ability.js"
}
ohos_shared_library("ability_napi") {
@ -26,13 +27,13 @@ ohos_shared_library("ability_napi") {
defines = [ "MAC_PLATFORM" ]
}
sources = [ "//foundation/ability/ability_runtime/frameworks/js/napi/ability/ability_module.cpp" ]
sources = [ "${ability_runtime_napi_path}/ability/ability_module.cpp" ]
deps = [
":gen_obj_src_ability_abc",
":gen_obj_src_ability_js",
"//foundation/arkui/napi:ace_napi",
]
external_deps = [ "napi:ace_napi" ]
part_name = "simulator"
subsystem_name = "ability"

13
frameworks/simulator/napi_module/ability_constant/BUILD.gn
View File

@ -12,6 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
ohos_shared_library("abilityconstant_napi") {
if (is_mingw) {
@ -21,17 +22,19 @@ ohos_shared_library("abilityconstant_napi") {
}
include_dirs = [
"//foundation/ability/ability_runtime/interfaces/inner_api/ability_manager/include",
"//foundation/ability/ability_runtime/interfaces/inner_api/ability_manager/include/continuation",
"${ability_runtime_innerkits_path}/ability_manager/include",
"${ability_runtime_innerkits_path}/ability_manager/include/continuation",
]
sources = [ "//foundation/ability/ability_runtime/frameworks/js/napi/ability_constant/ability_constant_module.cpp" ]
sources = [
"${ability_runtime_napi_path}/ability_constant/ability_constant_module.cpp",
]
deps = [
"${ability_runtime_path}/frameworks/simulator/osal:simulator_osal",
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog_$platform",
"//foundation/ability/ability_runtime/frameworks/simulator/osal:simulator_osal",
"//foundation/arkui/napi:ace_napi",
]
external_deps = [ "napi:ace_napi" ]
part_name = "simulator"
subsystem_name = "ability"

10
frameworks/simulator/napi_module/ability_context/BUILD.gn
View File

@ -12,11 +12,12 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
import(
"//foundation/ability/ability_runtime/frameworks/simulator/build/ability_simulator.gni")
gen_js_src_binary("ability_context") {
js_source = "//foundation/ability/ability_runtime/frameworks/js/napi/ability_context/ability_context.js"
js_source = "${ability_runtime_napi_path}/ability_context/ability_context.js"
}
ohos_shared_library("ability_context_napi") {
@ -26,14 +27,15 @@ ohos_shared_library("ability_context_napi") {
defines = [ "MAC_PLATFORM" ]
}
sources = [ "//foundation/ability/ability_runtime/frameworks/js/napi/ability_context/ability_context_module.cpp" ]
sources = [
"${ability_runtime_napi_path}/ability_context/ability_context_module.cpp",
]
deps = [
":gen_obj_src_ability_context_abc",
":gen_obj_src_ability_context_js",
"//foundation/arkui/napi:ace_napi",
]
external_deps = [ "napi:ace_napi" ]
part_name = "simulator"
subsystem_name = "ability"
}

9
frameworks/simulator/napi_module/ability_stage/BUILD.gn
View File

@ -12,11 +12,12 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
import(
"//foundation/ability/ability_runtime/frameworks/simulator/build/ability_simulator.gni")
gen_js_src_binary("ability_stage") {
js_source = "//foundation/ability/ability_runtime/frameworks/js/napi/app/ability_stage/ability_stage.js"
js_source = "${ability_runtime_napi_path}/app/ability_stage/ability_stage.js"
}
ohos_shared_library("ability_stage_napi") {
@ -26,13 +27,15 @@ ohos_shared_library("ability_stage_napi") {
defines = [ "MAC_PLATFORM" ]
}
sources = [ "//foundation/ability/ability_runtime/frameworks/js/napi/app/ability_stage/ability_stage_module.cpp" ]
sources = [
"${ability_runtime_napi_path}/app/ability_stage/ability_stage_module.cpp",
]
deps = [
":gen_obj_src_ability_stage_abc",
":gen_obj_src_ability_stage_js",
"//foundation/arkui/napi:ace_napi",
]
external_deps = [ "napi:ace_napi" ]
part_name = "simulator"
subsystem_name = "ability"

7
frameworks/simulator/napi_module/ability_stage_context/BUILD.gn
View File

@ -12,11 +12,12 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
import(
"//foundation/ability/ability_runtime/frameworks/simulator/build/ability_simulator.gni")
gen_js_src_binary("ability_stage_context") {
js_source = "//foundation/ability/ability_runtime/frameworks/js/napi/app/ability_stage_context/ability_stage_context.js"
js_source = "${ability_runtime_napi_path}/app/ability_stage_context/ability_stage_context.js"
}
ohos_shared_library("ability_stage_context_napi") {
@ -26,13 +27,13 @@ ohos_shared_library("ability_stage_context_napi") {
defines = [ "MAC_PLATFORM" ]
}
sources = [ "//foundation/ability/ability_runtime/frameworks/js/napi/app/ability_stage_context/ability_stage_context_module.cpp" ]
sources = [ "${ability_runtime_napi_path}/app/ability_stage_context/ability_stage_context_module.cpp" ]
deps = [
":gen_obj_src_ability_stage_context_abc",
":gen_obj_src_ability_stage_context_js",
"//foundation/arkui/napi:ace_napi",
]
external_deps = [ "napi:ace_napi" ]
part_name = "simulator"
subsystem_name = "ability"

8
frameworks/simulator/napi_module/application_context/BUILD.gn
View File

@ -12,11 +12,12 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
import(
"//foundation/ability/ability_runtime/frameworks/simulator/build/ability_simulator.gni")
gen_js_src_binary("application_context") {
js_source = "//foundation/ability/ability_runtime/frameworks/js/napi/app/application_context/application_context.js"
js_source = "${ability_runtime_napi_path}/app/application_context/application_context.js"
}
ohos_shared_library("application_context_napi") {
@ -26,14 +27,13 @@ ohos_shared_library("application_context_napi") {
defines = [ "MAC_PLATFORM" ]
}
sources = [ "//foundation/ability/ability_runtime/frameworks/js/napi/app/application_context/application_context_module.cpp" ]
sources = [ "${ability_runtime_napi_path}/app/application_context/application_context_module.cpp" ]
deps = [
":gen_obj_src_application_context_abc",
":gen_obj_src_application_context_js",
"//foundation/arkui/napi:ace_napi",
]
external_deps = [ "napi:ace_napi" ]
part_name = "simulator"
subsystem_name = "ability"
}

8
frameworks/simulator/napi_module/callee/BUILD.gn
View File

@ -12,12 +12,12 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
import(
"//foundation/ability/ability_runtime/frameworks/simulator/build/ability_simulator.gni")
gen_js_src_binary("callee") {
js_source =
"//foundation/ability/ability_runtime/frameworks/js/napi/callee/callee.js"
js_source = "${ability_runtime_napi_path}/callee/callee.js"
}
ohos_shared_library("callee_napi") {
@ -27,13 +27,13 @@ ohos_shared_library("callee_napi") {
defines = [ "MAC_PLATFORM" ]
}
sources = [ "//foundation/ability/ability_runtime/frameworks/js/napi/callee/callee_module.cpp" ]
sources = [ "${ability_runtime_napi_path}/callee/callee_module.cpp" ]
deps = [
":gen_obj_src_callee_abc",
":gen_obj_src_callee_js",
"//foundation/arkui/napi:ace_napi",
]
external_deps = [ "napi:ace_napi" ]
part_name = "simulator"
subsystem_name = "ability"

8
frameworks/simulator/napi_module/caller/BUILD.gn
View File

@ -12,12 +12,12 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
import(
"//foundation/ability/ability_runtime/frameworks/simulator/build/ability_simulator.gni")
gen_js_src_binary("caller") {
js_source =
"//foundation/ability/ability_runtime/frameworks/js/napi/caller/caller.js"
js_source = "${ability_runtime_napi_path}/caller/caller.js"
}
ohos_shared_library("caller_napi") {
@ -27,13 +27,13 @@ ohos_shared_library("caller_napi") {
defines = [ "MAC_PLATFORM" ]
}
sources = [ "//foundation/ability/ability_runtime/frameworks/js/napi/caller/caller_module.cpp" ]
sources = [ "${ability_runtime_napi_path}/caller/caller_module.cpp" ]
deps = [
":gen_obj_src_caller_abc",
":gen_obj_src_caller_js",
"//foundation/arkui/napi:ace_napi",
]
external_deps = [ "napi:ace_napi" ]
part_name = "simulator"
subsystem_name = "ability"

5
frameworks/simulator/napi_module/configuration_constant/BUILD.gn
View File

@ -12,14 +12,15 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
ohos_shared_library("configurationconstant_napi") {
include_dirs =
[ "//base/global/resource_management/interfaces/inner_api/include" ]
sources = [ "//foundation/ability/ability_runtime/frameworks/js/napi/configuration_constant/configuration_constant_module.cpp" ]
sources = [ "${ability_runtime_napi_path}/configuration_constant/configuration_constant_module.cpp" ]
deps = [ "//foundation/arkui/napi:ace_napi" ]
external_deps = [ "napi:ace_napi" ]
part_name = "simulator"
subsystem_name = "ability"

7
frameworks/simulator/napi_module/context/BUILD.gn
View File

@ -12,11 +12,12 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
import(
"//foundation/ability/ability_runtime/frameworks/simulator/build/ability_simulator.gni")
gen_js_src_binary("context") {
js_source = "//foundation/ability/ability_runtime/frameworks/js/napi/app/context/context.js"
js_source = "${ability_runtime_napi_path}/app/context/context.js"
}
ohos_shared_library("context_napi") {
@ -26,13 +27,13 @@ ohos_shared_library("context_napi") {
defines = [ "MAC_PLATFORM" ]
}
sources = [ "//foundation/ability/ability_runtime/frameworks/js/napi/app/context/context_module.cpp" ]
sources = [ "${ability_runtime_napi_path}/app/context/context_module.cpp" ]
deps = [
":gen_obj_src_context_abc",
":gen_obj_src_context_js",
"//foundation/arkui/napi:ace_napi",
]
external_deps = [ "napi:ace_napi" ]
part_name = "simulator"
subsystem_name = "ability"

10
frameworks/simulator/napi_module/want_constant/BUILD.gn
View File

@ -12,6 +12,7 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
ohos_shared_library("wantconstant_napi") {
if (is_mingw) {
@ -21,16 +22,15 @@ ohos_shared_library("wantconstant_napi") {
}
sources = [
"//foundation/ability/ability_runtime/frameworks/js/napi/wantConstant/native_module.cpp",
"//foundation/ability/ability_runtime/frameworks/js/napi/wantConstant/want_constant.cpp",
"${ability_runtime_napi_path}/wantConstant/native_module.cpp",
"${ability_runtime_napi_path}/wantConstant/want_constant.cpp",
]
deps = [
"${ability_runtime_path}/frameworks/simulator/osal:simulator_osal",
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog_$platform",
"//foundation/ability/ability_runtime/frameworks/simulator/osal:simulator_osal",
"//foundation/arkui/napi:ace_napi",
]
external_deps = [ "napi:ace_napi" ]
part_name = "simulator"
subsystem_name = "ability"
}

3
frameworks/simulator/osal/BUILD.gn
View File

@ -12,11 +12,12 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
config("simulator_osal_public_config") {
include_dirs = [
"include",
"//foundation/ability/ability_runtime/services/common/include",
"${ability_runtime_services_path}/common/include",
]
}

3
frameworks/simulator/test/BUILD.gn
View File

@ -12,11 +12,12 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/ability/ability_runtime/ability_runtime.gni")
ohos_executable("ability_simulator_test") {
sources = [ "src/main.cpp" ]
deps = [ "//foundation/ability/ability_runtime/frameworks/simulator/ability_simulator:ability_simulator" ]
deps = [ "${ability_runtime_path}/frameworks/simulator/ability_simulator:ability_simulator" ]
part_name = "simulator"
subsystem_name = "ability"

8
interfaces/inner_api/ability_manager/BUILD.gn
View File

@ -17,11 +17,11 @@ import("//foundation/ability/ability_runtime/ability_runtime.gni")
config("ability_manager_public_config") {
visibility = [ ":*" ]
visibility += [
"${ability_runtime_test_path}/fuzztest/*",
"${ability_runtime_test_path}/moduletest/*",
"${ability_runtime_test_path}/unittest/*",
"${form_fwk_path}/test/fuzztest/*",
"//base/account/os_account/tools/test/moduletest/acm/*",
"//foundation/ability/ability_runtime/test/fuzztest/*",
"//foundation/ability/ability_runtime/test/moduletest/*",
"//foundation/ability/ability_runtime/test/unittest/*",
"//foundation/ability/form_fwk/test/fuzztest/*",
]
include_dirs = [
"include/",

3
interfaces/inner_api/connectionobs_manager/BUILD.gn
View File

@ -16,7 +16,8 @@ import("//foundation/ability/ability_runtime/ability_runtime.gni")
config("connection_obs_manager_public_config") {
visibility = [ ":*" ]
visibility += [ "//foundation/ability/ability_runtime/test/unittest/connection_observer_test/*" ]
visibility +=
[ "${ability_runtime_test_path}/unittest/connection_observer_test/*" ]
include_dirs = [
"include",
"${ability_runtime_services_path}/common/include",

2
interfaces/inner_api/runtime/BUILD.gn
View File

@ -77,8 +77,8 @@ ohos_shared_library("runtime") {
deps = [
"${ability_runtime_native_path}/ability/native:ability_business_error",
"${arkui_path}/napi:ace_napi_ark",
"${third_party_path}/zlib:shared_libz",
"//foundation/arkui/napi:ace_napi_ark",
]
external_deps = [

2
interfaces/inner_api/uri_permission/BUILD.gn
View File

@ -16,7 +16,7 @@ import("//foundation/ability/ability_runtime/ability_runtime.gni")
config("uripermkit_public_config") {
visibility = [ ":*" ]
visibility += [ "//foundation/ability/ability_runtime/test/unittest/*" ]
visibility += [ "${ability_runtime_test_path}/unittest/*" ]
include_dirs = [ "include" ]
cflags = []
if (target_cpu == "arm") {

10
interfaces/inner_api/wantagent/BUILD.gn
View File

@ -21,12 +21,12 @@ group("native_wantagent") {
config("wantagent_innerkits_public_config") {
visibility = [ ":*" ]
visibility += [
"${ability_runtime_innerkits_path}/wantagent/*",
"${ability_runtime_napi_path}/inner/*",
"${ability_runtime_native_path}/ability/native/*",
"${ability_runtime_test_path}/fuzztest/*",
"${device_usage_statistics_path}/*",
"//base/notification/distributed_notification_service/*",
"//foundation/ability/ability_runtime/frameworks/js/napi/inner/*",
"//foundation/ability/ability_runtime/frameworks/native/ability/native/*",
"//foundation/ability/ability_runtime/interfaces/inner_api/wantagent/*",
"//foundation/ability/ability_runtime/test/fuzztest/*",
"//foundation/resourceschedule/device_usage_statistics/*",
]
include_dirs = [

2
js_environment/test/unittest/source_map_test/BUILD.gn
View File

@ -28,8 +28,8 @@ ohos_unittest("source_map_test") {
]
external_deps = [
"ability_runtime:js_environment",
"ability_base:want",
"ability_runtime:js_environment",
"bundle_framework:appexecfwk_base",
"c_utils:utils",
"eventhandler:libeventhandler",

18
services/common/BUILD.gn
View File

@ -26,18 +26,18 @@ group("ams_common_target") {
config("common_config") {
visibility = [ ":*" ]
visibility += [
"${ability_runtime_innerkits_path}/*",
"${ability_runtime_napi_path}/*",
"${ability_runtime_native_path}/ability/native/*",
"${ability_runtime_path}/frameworks/simulator/ability_simulator/*",
"${ability_runtime_path}/tools/aa/*",
"${ability_runtime_services_path}/common/*",
"${ability_runtime_services_path}/quickfixmgr/*",
"${ability_runtime_services_path}/uripermmgr/*",
"${ability_runtime_test_path}/*",
"//base/powermgr/power_manager/utils/*",
"//base/request/request/common/*",
"//developtools/profiler/hiebpf/*",
"//foundation/ability/ability_runtime/frameworks/js/napi/*",
"//foundation/ability/ability_runtime/frameworks/native/ability/native/*",
"//foundation/ability/ability_runtime/frameworks/simulator/ability_simulator/*",
"//foundation/ability/ability_runtime/interfaces/inner_api/*",
"//foundation/ability/ability_runtime/services/common/*",
"//foundation/ability/ability_runtime/services/quickfixmgr/*",
"//foundation/ability/ability_runtime/services/uripermmgr/*",
"//foundation/ability/ability_runtime/test/*",
"//foundation/ability/ability_runtime/tools/aa/*",
]
include_dirs = [
"include",

2
services/uripermmgr/BUILD.gn
View File

@ -16,7 +16,7 @@ import("//foundation/ability/ability_runtime/ability_runtime.gni")
config("upms_config") {
visibility = [ ":*" ]
visibility += [ "//foundation/ability/ability_runtime/test/unittest/*" ]
visibility += [ "${ability_runtime_test_path}/unittest/*" ]
include_dirs = [ "include" ]
cflags = []
if (target_cpu == "arm") {

4
test/mock/services_abilitymgr_test/libs/arkui_mock/BUILD.gn
View File

@ -19,8 +19,8 @@ config("arkui_mock_config") {
"${ace_engine_path}/interfaces/inner_api/ui_service_manager/include",
"${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/arkui_mock/include",
"${ace_engine_path}/adapter/ohos/services/uiservice/include",
"//foundation/window/window_manager/interfaces/innerkits",
"//foundation/multimodalinput/input/interfaces/native/innerkits/event/include",
"${windowmanager_path}/interfaces/innerkits",
"${multimodalinput_path}/interfaces/native/innerkits/event/include",
]
cflags = []
if (target_cpu == "arm") {

2
test/moduletest/common/ams/specified_ability_service_test/BUILD.gn
View File

@ -32,7 +32,7 @@ ohos_moduletest("specified_ability_service_test") {
"${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/sa_mgr/src/sa_mgr_client_mock.cpp",
"${ability_runtime_test_path}/moduletest/mock/src/mock_app_mgr_client.cpp",
"${ability_runtime_test_path}/moduletest/mock/src/mock_bundle_mgr.cpp",
"//foundation/distributedhardware/device_manager/test/unittest/mock/parameter.cpp",
"${device_manager_path}/test/unittest/mock/parameter.cpp",
]
configs = [

2
test/moduletest/on_new_want_module_test/BUILD.gn
View File

@ -29,7 +29,7 @@ ohos_moduletest("on_new_want_module_test") {
sources = [ "on_new_want_module_test.cpp" ]
sources += [
"${ability_runtime_services_path}/abilitymgr/src/ability_manager_service.cpp",
"//foundation/distributedhardware/device_manager/test/unittest/mock/parameter.cpp",
"${device_manager_path}/test/unittest/mock/parameter.cpp",
]
configs = [

6
test/unittest/ability_manager_service_anr_test/BUILD.gn
View File

@ -22,9 +22,9 @@ ohos_unittest("ability_manager_service_anr_test") {
include_dirs = [
"${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/system_ability_mock",
"${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/arkui_mock",
"//foundation/arkui/ace_engine/frameworks",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include",
"//foundation/systemabilitymgr/samgr/adapter/interfaces/innerkits/include/",
"${ace_engine_path}/frameworks",
"${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
"${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
"${ability_runtime_innerkits_path}/app_manager/include/appmgr",
"${ability_runtime_test_path}/mock/frameworks_kits_ability_native_test/include",
"${common_event_service_path}/frameworks/core/include",

6
test/unittest/ability_manager_service_test/BUILD.gn
View File

@ -29,9 +29,9 @@ ohos_unittest("ability_manager_service_test") {
"${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
"${ability_runtime_innerkits_path}/app_manager/include/appmgr",
"${ability_runtime_test_path}/mock/frameworks_kits_ability_native_test/include",
"//foundation/resourceschedule/background_task_mgr/services/transient_task/include",
"//foundation/arkui/ace_engine/frameworks",
"//foundation/resourceschedule/resource_schedule_service/ressched/interfaces/innerkits/ressched_client/include",
"${resourceschedule_path}/background_task_mgr/services/transient_task/include",
"${ace_engine_path}/frameworks",
"${resourceschedule_path}/resource_schedule_service/ressched/interfaces/innerkits/ressched_client/include",
"mock/include",
]

2
test/unittest/application_context_test/BUILD.gn
View File

@ -21,7 +21,7 @@ ohos_unittest("application_context_test") {
include_dirs = [ "${ability_runtime_test_path}/mock/frameworks_kits_ability_native_test/include" ]
sources = [
"//foundation/ability/ability_runtime/test/unittest/application_context_test/mock_context_impl.cpp",
"${ability_runtime_test_path}/unittest/application_context_test/mock_context_impl.cpp",
"application_context_test.cpp",
]

2
test/unittest/continuation_test/remote_register_service_test/connect_callback_proxy_test/BUILD.gn
View File

@ -40,7 +40,7 @@ ohos_unittest("connect_callback_proxy_test") {
cflags += [ "-DBINDER_IPC_32BIT" ]
}
deps = [
"//foundation/ability/ability_runtime/frameworks/native/ability/native:continuation_ipc",
"${ability_runtime_native_path}/ability/native:continuation_ipc",
"//third_party/googletest:gmock_main",
"//third_party/googletest:gtest_main",
]

2
test/unittest/continuation_test/remote_register_service_test/connect_callback_stub_test/BUILD.gn
View File

@ -40,7 +40,7 @@ ohos_unittest("connect_callback_stub_test") {
cflags += [ "-DBINDER_IPC_32BIT" ]
}
deps = [
"//foundation/ability/ability_runtime/frameworks/native/ability/native:continuation_ipc",
"${ability_runtime_native_path}/ability/native:continuation_ipc",
"//third_party/googletest:gmock_main",
"//third_party/googletest:gtest_main",
]

2
test/unittest/continuation_test/remote_register_service_test/continuation_device_callback_proxy_test/BUILD.gn
View File

@ -46,7 +46,7 @@ ohos_unittest("continuation_device_callback_proxy_test") {
cflags += [ "-DBINDER_IPC_32BIT" ]
}
deps = [
"//foundation/ability/ability_runtime/frameworks/native/ability/native:continuation_ipc",
"${ability_runtime_native_path}/ability/native:continuation_ipc",
"//third_party/googletest:gmock_main",
"//third_party/googletest:gtest_main",
]

4
test/unittest/continuation_test/remote_register_service_test/continuation_register_manager_proxy_test/BUILD.gn
View File

@ -46,7 +46,7 @@ config("ability_config") {
"${ability_runtime_path}/interfaces/kits/native/appkit/app/task",
"${ability_runtime_napi_path}/inner/napi_common",
"${ability_runtime_napi_path}/featureAbility",
"//foundation/ability/ability_runtime/interfaces/kits/native/ability/native/continuation/kits",
"${ability_runtime_path}/interfaces/kits/native/ability/native/continuation/kits",
]
cflags = []
@ -83,7 +83,7 @@ ohos_unittest("continuation_register_manager_proxy_test") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"//foundation/ability/ability_runtime/frameworks/native/ability/native:continuation_ipc",
"${ability_runtime_native_path}/ability/native:continuation_ipc",
"//third_party/googletest:gmock_main",
"//third_party/googletest:gtest_main",
]

4
test/unittest/continuation_test/remote_register_service_test/continuation_register_manager_test/BUILD.gn
View File

@ -46,7 +46,7 @@ config("ability_config") {
"${ability_runtime_path}/interfaces/kits/native/appkit/app/task",
"${ability_runtime_napi_path}/inner/napi_common",
"${ability_runtime_napi_path}/featureAbility",
"//foundation/ability/ability_runtime/interfaces/kits/native/ability/native/continuation/kits",
"${ability_runtime_path}/interfaces/kits/native/ability/native/continuation/kits",
]
cflags = []
@ -83,7 +83,7 @@ ohos_unittest("continuation_register_manager_test") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"//foundation/ability/ability_runtime/frameworks/native/ability/native:continuation_ipc",
"${ability_runtime_native_path}/ability/native:continuation_ipc",
"//third_party/googletest:gmock_main",
"//third_party/googletest:gtest_main",
]

2
test/unittest/continuation_test/remote_register_service_test/remote_register_service_proxy_test/BUILD.gn
View File

@ -45,7 +45,7 @@ ohos_unittest("remote_register_service_proxy_test") {
cflags += [ "-DBINDER_IPC_32BIT" ]
}
deps = [
"//foundation/ability/ability_runtime/frameworks/native/ability/native:continuation_ipc",
"${ability_runtime_native_path}/ability/native:continuation_ipc",
"//third_party/googletest:gmock_main",
"//third_party/googletest:gtest_main",
]

2
test/unittest/continuation_test/remote_register_service_test/remote_register_service_stub_test/BUILD.gn
View File

@ -45,7 +45,7 @@ ohos_unittest("remote_register_service_stub_test") {
cflags += [ "-DBINDER_IPC_32BIT" ]
}
deps = [
"//foundation/ability/ability_runtime/frameworks/native/ability/native:continuation_ipc",
"${ability_runtime_native_path}/ability/native:continuation_ipc",
"//third_party/googletest:gmock_main",
"//third_party/googletest:gtest_main",
]

5
test/unittest/form_extension_context_test/BUILD.gn
View File

@ -22,8 +22,7 @@ ohos_unittest("form_extension_context_test") {
include_dirs = [
"${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/system_ability_mock",
"${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
"//foundation/ability/ability_runtime/frameworks/native/ability/native",
"//foundation/ability/ability_runtime/interfaces/kits/ative/appkit/ability_runtime",
"${ability_runtime_native_path}/ability/native",
]
sources = [
@ -43,6 +42,7 @@ ohos_unittest("form_extension_context_test") {
"${ability_runtime_napi_path}/inner/napi_common:napi_common",
"${ability_runtime_native_path}/ability/native:ability_business_error",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_native_path}/ability/native:form_extension",
"${ability_runtime_native_path}/appkit:app_context",
"${ability_runtime_services_path}/abilitymgr:abilityms",
"${ability_runtime_services_path}/common:perm_verification",
@ -50,7 +50,6 @@ ohos_unittest("form_extension_context_test") {
"${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core:appexecfwk_appmgr_mock",
"${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core:appexecfwk_bundlemgr_mock",
"${ability_runtime_test_path}/unittest:abilityms_test_source",
"//foundation/ability/ability_runtime/frameworks/native/ability/native:form_extension",
"//third_party/googletest:gtest_main",
]

30
test/unittest/frameworks_kits_ability_native_test/BUILD.gn
View File

@ -39,7 +39,7 @@ config("module_private_config") {
"${ability_runtime_services_path}/common/include",
"${distributeddatamgr_path}/distributeddatamgr/interfaces/innerkits/app_distributeddata/include",
"${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
"//foundation/ability/ability_base/interfaces/kits/native/extractortool/include",
"${ability_base_kits_path}/extractortool/include",
"${ability_runtime_test_path}/mock/services_appmgr_test/include",
"${ability_runtime_path}/interfaces/kits/native/ability/ability_runtime",
]
@ -425,15 +425,15 @@ ohos_unittest("data_ability_helper_impl_test") {
"${ability_runtime_services_path}/abilitymgr/include",
"${ability_runtime_path}/interfaces/kits/native/ability/native",
"${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context",
"//foundation/ability/ability_runtime/interfaces/kits/native/ability/native",
"${ability_runtime_path}/interfaces/kits/native/ability/native",
"${ability_runtime_innerkits_path}/dataobs_manager/include",
"//foundation/ability/ability_runtime/test/mock/frameworks_kits_ability_native_test/include",
"//foundation/ability/ability_runtime/interfaces/inner_api/dataobs_manager/include",
"//foundation/ability/ability_runtime/services/dataobsmgr/include",
"${ability_runtime_test_path}/mock/frameworks_kits_ability_native_test/include",
"${ability_runtime_innerkits_path}/dataobs_manager/include",
"${ability_runtime_services_path}/dataobsmgr/include",
]
sources = [
"${ability_runtime_path}/test/mock/frameworks_kits_ability_native_test/include/mock_ability_manager_service.cpp",
"//foundation/ability/ability_runtime/services/dataobsmgr/src/data_ability_observer_stub.cpp",
"${ability_runtime_services_path}/dataobsmgr/src/data_ability_observer_stub.cpp",
"data_ability_helper_impl_test.cpp",
"mock_ability_runtime_context.cpp",
]
@ -601,9 +601,9 @@ ohos_unittest("ability_thread_test") {
module_out_path = module_output_path
include_dirs = [
"//foundation/ability/ability_runtime/test/unittest/dataobs_mgr_stub_test",
"//foundation/ability/ability_runtime/services/dataobsmgr/include/",
"//foundation/ability/ability_runtime/interfaces/inner_api/dataobs_manager/include/",
"${ability_runtime_test_path}/unittest/dataobs_mgr_stub_test",
"${ability_runtime_services_path}/dataobsmgr/include/",
"${ability_runtime_innerkits_path}/dataobs_manager/include/",
]
sources = [
@ -674,11 +674,11 @@ ohos_unittest("service_extension_module_loader_test") {
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_native_path}/ability/native:service_extension",
"${ability_runtime_native_path}/appkit:app_context",
"${ability_runtime_native_path}/appkit:appkit_native",
"${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"${global_path}/resource_management/frameworks/resmgr:global_resmgr",
"//foundation/ability/ability_runtime/frameworks/native/ability/native:service_extension",
"//third_party/googletest:gmock_main",
"//third_party/googletest:gtest_main",
]
@ -954,20 +954,20 @@ ohos_unittest("data_ability_impl_test") {
"${ability_runtime_services_path}/abilitymgr/include",
"${ability_runtime_path}/interfaces/kits/native/ability/native",
"${ability_base_kits_path}/extractortool/include",
"//foundation/distributeddatamgr/relational_store/frameworks/js/napi/rdb/include",
"//foundation/distributeddatamgr/relational_store/frameworks/js/napi/common/include",
"//foundation/distributeddatamgr/relational_store/frameworks/js/napi/dataability/include",
"${distributeddatamgr_path}/relational_store/frameworks/js/napi/rdb/include",
"${distributeddatamgr_path}/relational_store/frameworks/js/napi/common/include",
"${distributeddatamgr_path}/relational_store/frameworks/js/napi/dataability/include",
]
sources = [
"${ability_runtime_innerkits_path}/app_manager/src/appmgr/process_info.cpp",
"${ability_runtime_native_path}/ability/native/data_ability_impl.cpp",
"${ability_runtime_native_path}/appkit/app/app_context.cpp",
"${ability_runtime_native_path}/appkit/app/app_loader.cpp",
"${ability_runtime_native_path}/appkit/app/context_container.cpp",
"${ability_runtime_native_path}/appkit/app/context_deal.cpp",
"${ability_runtime_native_path}/appkit/app/ohos_application.cpp",
"${ability_runtime_test_path}/mock/frameworks_kits_ability_native_test/include/mock_replace_ability_impl.cpp",
"//foundation/ability/ability_runtime/frameworks/native/ability/native/data_ability_impl.cpp",
"data_ability_impl_test.cpp",
]
@ -1692,7 +1692,7 @@ ohos_unittest("distributed_client_test") {
ohos_unittest("ability_window_test") {
module_out_path = module_output_path
include_dirs = [ "//foundation/window/window_manager/wm/include" ]
include_dirs = [ "${windowmanager_path}/wm/include" ]
sources = [
"${ability_runtime_native_path}/appkit/app/ability_record_mgr.cpp",
"${ability_runtime_native_path}/appkit/app/app_context.cpp",

4
test/unittest/quick_fix/quick_fix_info_test/BUILD.gn
View File

@ -19,11 +19,11 @@ ohos_unittest("quick_fix_info_test") {
module_out_path = "ability_runtime/quick_fix"
include_dirs = [
"//foundation/ability/ability_runtime/interfaces/inner_api/quick_fix/include",
"${ability_runtime_innerkits_path}/quick_fix/include",
"mock",
]
sources = [
"//foundation/ability/ability_runtime/interfaces/inner_api/quick_fix/src/quick_fix_info.cpp",
"${ability_runtime_innerkits_path}/quick_fix/src/quick_fix_info.cpp",
"mock/parcel.cpp",
"quick_fix_info_test.cpp",
]

4
test/unittest/quick_fix/quick_fix_manager_service_ability_test/BUILD.gn
View File

@ -19,11 +19,11 @@ ohos_unittest("quick_fix_manager_service_ability_test") {
module_out_path = "ability_runtime/quick_fix"
include_dirs = [
"//foundation/ability/ability_runtime/services/quickfixmgr/include",
"${ability_runtime_services_path}/quickfixmgr/include",
"mock",
]
sources = [
"//foundation/ability/ability_runtime/services/quickfixmgr/src/quick_fix_manager_service_ability.cpp",
"${ability_runtime_services_path}/quickfixmgr/src/quick_fix_manager_service_ability.cpp",
"mock/mock_quick_fix_manager_service.cpp",
"quick_fix_manager_service_ability_test.cpp",
]

4
test/unittest/runtime_test/BUILD.gn
View File

@ -46,7 +46,7 @@ ohos_unittest("runtime_test") {
include_dirs = [
"${ability_runtime_native_path}/runtime",
"${ability_runtime_native_path}/runtime/utils/include",
"//foundation/ability/ability_base/interfaces/kits/native/extractortool/include",
"${ability_base_kits_path}/extractortool/include",
"//third_party/zlib/contrib/minizip",
"//third_party/zlib",
]
@ -110,7 +110,7 @@ ohos_unittest("hdc_register_test") {
sources = [
# add mock file
"//foundation/ability/ability_runtime/frameworks/native/runtime/hdc_register.cpp",
"${ability_runtime_native_path}/runtime/hdc_register.cpp",
"hdc_register_test.cpp",
]

6
test/unittest/service_extension_context_test/BUILD.gn
View File

@ -22,8 +22,8 @@ ohos_unittest("service_extension_context_test") {
include_dirs = [
"${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/system_ability_mock",
"${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
"//foundation/ability/ability_runtime/frameworks/native/ability/native",
"//foundation/ability/ability_runtime/interfaces/kits/ative/appkit/ability_runtime",
"${ability_runtime_native_path}/ability/native",
"${ability_runtime_path}/interfaces/kits/ative/appkit/ability_runtime",
]
sources = [
@ -43,13 +43,13 @@ ohos_unittest("service_extension_context_test") {
"${ability_runtime_napi_path}/inner/napi_common:napi_common",
"${ability_runtime_native_path}/ability/native:ability_business_error",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_native_path}/ability/native:service_extension",
"${ability_runtime_native_path}/appkit:app_context",
"${ability_runtime_services_path}/abilitymgr:abilityms",
"${ability_runtime_services_path}/common:perm_verification",
"${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock",
"${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core:appexecfwk_appmgr_mock",
"${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core:appexecfwk_bundlemgr_mock",
"//foundation/ability/ability_runtime/frameworks/native/ability/native:service_extension",
"//third_party/googletest:gmock_main",
"//third_party/googletest:gtest_main",
]

2
tools/test/unittest/aa/BUILD.gn
View File

@ -277,7 +277,7 @@ if (accessibility_enable) {
include_dirs = [ "//third_party/jsoncpp/include" ]
sources = [
"//foundation/ability/ability_runtime/tools/aa/src/accessibility_ability_utils.cpp",
"${ability_runtime_path}/tools/aa/src/accessibility_ability_utils.cpp",
"accessibility_ability_utils_test.cpp",
]