已合并
编译规范整改 #175
guoxu1111创建于 8月6日
编译规范整改 #175
已合并
共 3 个文件变更+14-12
| @@ -54,7 +54,8 @@ | |||
| 54 | "hiappevent", | 54 | "hiappevent", |
| 55 | "udmf", | 55 | "udmf", |
| 56 | "runtime_core", | 56 | "runtime_core", |
| 57 | - "taihe_ffi_gen" | 57 | + "taihe_ffi_gen", |
| 58 | + "ets_frontend" | ||
| 58 | ], | 59 | ], |
| 59 | "third_party": [ | 60 | "third_party": [ |
| 60 | ] | 61 | ] |
| @@ -71,6 +71,7 @@ ohos_shared_library("selection_ability") { | |||
| 71 | ] | 71 | ] |
| 72 | 72 | ||
| 73 | external_deps = [ | 73 | external_deps = [ |
| 74 | + "window_manager:libwm", | ||
| 74 | "c_utils:utils", | 75 | "c_utils:utils", |
| 75 | "ipc:ipc_single", | 76 | "ipc:ipc_single", |
| 76 | "hilog:libhilog", | 77 | "hilog:libhilog", |
| @@ -103,8 +104,6 @@ ohos_shared_library("selection_ability") { | |||
| 103 | defines += [ "SCENE_BOARD_ENABLE" ] | 104 | defines += [ "SCENE_BOARD_ENABLE" ] |
| 104 | } | 105 | } |
| 105 | 106 | ||
| 106 | - public_external_deps = [ "window_manager:libwm" ] | ||
| 107 | - | ||
| 108 | part_name = "selectionfwk" | 107 | part_name = "selectionfwk" |
| 109 | subsystem_name = "systemabilitymgr" | 108 | subsystem_name = "systemabilitymgr" |
| 110 | } | 109 | } |
| @@ -16,6 +16,8 @@ import("//foundation/systemabilitymgr/selectionfwk/selection_service.gni") | |||
| 16 | 16 | ||
| 17 | module_out_path = "selectionfwk/selectionfwk" | 17 | module_out_path = "selectionfwk/selectionfwk" |
| 18 | ohos_unittest("selection_service_unit_test") { | 18 | ohos_unittest("selection_service_unit_test") { |
| 19 | + external_deps = [] | ||
| 20 | + defines = [] | ||
| 19 | module_out_path = module_out_path | 21 | module_out_path = module_out_path |
| 20 | branch_protector_ret = "pac_ret" | 22 | branch_protector_ret = "pac_ret" |
| 21 | sanitize = { | 23 | sanitize = { |
| @@ -71,7 +73,15 @@ ohos_unittest("selection_service_unit_test") { | |||
| 71 | "${selection_fwk_root_path}/interfaces/idl:selection_listener_proxy", | 73 | "${selection_fwk_root_path}/interfaces/idl:selection_listener_proxy", |
| 72 | "${selection_fwk_root_path}/frameworks/native/selection_ability:selection_ability", | 74 | "${selection_fwk_root_path}/frameworks/native/selection_ability:selection_ability", |
| 73 | ] | 75 | ] |
| 74 | - external_deps = [ | 76 | + |
| 77 | + if (window_manager_use_sceneboard) { | ||
| 78 | + external_deps += [ "window_manager:libwm_lite" ] | ||
| 79 | + defines += [ "SCENE_BOARD_ENABLE" ] | ||
| 80 | + } else { | ||
| 81 | + external_deps += [ "window_manager:libwm" ] | ||
| 82 | + } | ||
| 83 | + | ||
| 84 | + external_deps += [ | ||
| 75 | "ability_base:want", | 85 | "ability_base:want", |
| 76 | "ability_runtime:ability_manager", | 86 | "ability_runtime:ability_manager", |
| 77 | "c_utils:utils", | 87 | "c_utils:utils", |
| @@ -91,14 +101,6 @@ ohos_unittest("selection_service_unit_test") { | |||
| 91 | "graphic_2d:librender_service_client", | 101 | "graphic_2d:librender_service_client", |
| 92 | ] | 102 | ] |
| 93 | 103 | ||
| 94 | - defines = [] | ||
| 95 | - if (window_manager_use_sceneboard) { | ||
| 96 | - external_deps += [ "window_manager:libwm_lite" ] | ||
| 97 | - defines += [ "SCENE_BOARD_ENABLE" ] | ||
| 98 | - } else { | ||
| 99 | - external_deps += [ "window_manager:libwm" ] | ||
| 100 | - } | ||
| 101 | - | ||
| 102 | part_name = "selectionfwk" | 104 | part_name = "selectionfwk" |
| 103 | subsystem_name = "systemabilitymgr" | 105 | subsystem_name = "systemabilitymgr" |
| 104 | } | 106 | } |