mirror of
https://gitee.com/openharmony/ability_ability_runtime
synced 2025-01-02 05:09:34 +00:00
Merge conflict
Signed-off-by: donglin <donglin9@huawei.com>
This commit is contained in:
parent
0fa40451b1
commit
7c09e3dcc4
@ -136,8 +136,8 @@ ohos_shared_library("abilityms") {
|
||||
"relational_store:native_dataability",
|
||||
"relational_store:native_rdb",
|
||||
"safwk:system_ability_fwk",
|
||||
"samgr_standard:samgr_proxy",
|
||||
"samgr:samgr_proxy",
|
||||
"samgr_standard:samgr_proxy",
|
||||
"startup_l2:syspara",
|
||||
"startup_l2:syspara_watchagent",
|
||||
"utils_base:utils",
|
||||
|
Loading…
Reference in New Issue
Block a user