独立编译整改

Signed-off-by: zhangzezhong <zhangzezhong8@huawei-partners.com>
This commit is contained in:
zhangzezhong
2025-02-24 10:15:15 +08:00
parent 7e92794b09
commit b3fd04a578
26 changed files with 65 additions and 34 deletions
+1
View File
@@ -49,6 +49,7 @@ ohos_shared_library("cj_ability_ffi") {
deps = [
"${ability_runtime_innerkits_path}/app_manager:app_manager",
"${ability_runtime_innerkits_path}/runtime:runtime",
"${ability_runtime_native_path}/ability/native:auto_startup_callback",
"${ability_runtime_native_path}/appkit:app_context",
"${ability_runtime_native_path}/appkit:app_context_utils",
+2
View File
@@ -37,9 +37,11 @@ ohos_shared_library("cj_app_recovery_ffi") {
]
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub",
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
"${ability_runtime_innerkits_path}/runtime:runtime",
"${ability_runtime_napi_path}/inner/napi_common:napi_common",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_native_path}/ability/native:uiabilitykit_native",
"${ability_runtime_native_path}/appkit:appkit_native",
@@ -35,7 +35,7 @@ ohos_shared_library("ark_interop_helper_ffi") {
debug = false
}
deps = []
deps = [ "${ability_runtime_napi_path}/inner/napi_common:napi_common" ]
if (build_ohos_sdk) {
defines += [ "PREVIEW" ]
@@ -56,9 +56,6 @@ ohos_shared_library("featureability") {
]
if (ability_runtime_graphics) {
include_dirs += [
"${windowmanager_path}/interfaces/kits/napi/window_runtime/window_napi",
]
external_deps += [ "window_manager:window_native_kit" ]
defines = [
"SUPPORT_GRAPHICS",
@@ -35,6 +35,7 @@ ohos_shared_library("napi_ability_common") {
]
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub",
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_setting",
+1
View File
@@ -66,6 +66,7 @@ ohos_shared_library("ability_context_native") {
]
deps = [
"${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub",
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
"${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper",
+37 -21
View File
@@ -94,11 +94,6 @@ config("ability_public_config") {
]
if (ability_runtime_graphics) {
include_dirs += [
"${windowmanager_path}/interfaces/kits/napi/window_runtime/window_stage_napi",
"${windowmanager_path}/interfaces/innerkits/wm",
"${windowmanager_path}/interfaces/innerkits/dm",
]
defines = [ "SUPPORT_GRAPHICS" ]
}
}
@@ -314,7 +309,9 @@ ohos_shared_library("abilitykit_native") {
":configuration_helper",
":continuation_ipc",
":extension_blocklist_config",
":extensionkit_native",
":ui_service_extension_connection",
"${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub",
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_setting",
@@ -324,6 +321,7 @@ ohos_shared_library("abilitykit_native") {
"${ability_runtime_innerkits_path}/napi_base_context:napi_base_context",
"${ability_runtime_innerkits_path}/runtime:runtime",
"${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits",
"${ability_runtime_napi_path}/inner/napi_common:napi_common",
"${ability_runtime_native_path}/ability:ability_context_native",
"${ability_runtime_native_path}/ability/native:ability_business_error",
"${ability_runtime_native_path}/appkit:app_context",
@@ -411,7 +409,6 @@ ohos_shared_library("abilitykit_native") {
}
public_deps = [
":abilitykit_utils",
":extensionkit_native",
"${ability_runtime_napi_path}/inner/napi_common:napi_common",
]
@@ -456,10 +453,6 @@ config("extensionkit_public_config") {
]
if (ability_runtime_graphics) {
include_dirs += [
"${windowmanager_path}/interfaces/innerkits/wm",
"${windowmanager_path}/utils/include",
]
defines = [ "SUPPORT_GRAPHICS" ]
}
}
@@ -489,6 +482,7 @@ ohos_shared_library("extensionkit_native") {
public_configs = [ ":extensionkit_public_config" ]
deps = [
":abilitykit_utils",
":configuration_helper",
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
@@ -662,10 +656,6 @@ config("uiability_config") {
]
if (ability_runtime_graphics) {
include_dirs += [
"${windowmanager_path}/interfaces/innerkits/wm",
"${windowmanager_path}/utils/include",
]
defines = [
"SUPPORT_GRAPHICS",
"SUPPORT_SCREEN",
@@ -699,12 +689,15 @@ ohos_shared_library("uiabilitykit_native") {
":abilitykit_native",
":configuration_helper",
":continuation_ipc",
":extensionkit_native",
":ui_extension",
"${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub",
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_setting",
"${ability_runtime_innerkits_path}/ability_manager:process_options",
"${ability_runtime_innerkits_path}/runtime:runtime",
"${ability_runtime_napi_path}/inner/napi_common:napi_common",
"${ability_runtime_native_path}/ability:ability_context_native",
"${ability_runtime_native_path}/ability/native:insight_intent_executor",
"${ability_runtime_native_path}/appkit:app_context",
@@ -800,9 +793,11 @@ ohos_shared_library("ability_thread") {
":abilitykit_native",
":extensionkit_native",
":uiabilitykit_native",
"${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub",
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
"${ability_runtime_innerkits_path}/dataobs_manager:dataobs_manager",
"${ability_runtime_napi_path}/inner/napi_common:napi_common",
"${ability_runtime_native_path}/ability:ability_context_native",
"${ability_runtime_native_path}/appkit:app_context",
"${ability_runtime_path}/utils/global/freeze:freeze_util",
@@ -862,6 +857,7 @@ ohos_shared_library("form_extension") {
deps = [
":abilitykit_native",
":extensionkit_native",
"${ability_runtime_innerkits_path}/runtime:runtime",
"${ability_runtime_napi_path}/inner/napi_common:napi_common",
"${ability_runtime_native_path}/ability:ability_context_native",
@@ -907,7 +903,10 @@ ohos_shared_library("form_extension_module") {
configs = [ ":ability_config" ]
public_configs = [ ":ability_public_config" ]
deps = [ ":form_extension" ]
deps = [
":form_extension",
"${ability_runtime_innerkits_path}/runtime:runtime",
]
external_deps = [
"ability_base:configuration",
@@ -953,6 +952,8 @@ ohos_shared_library("service_extension") {
deps = [
":abilitykit_native",
":extensionkit_native",
"${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub",
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
"${ability_runtime_innerkits_path}/runtime:runtime",
@@ -1073,7 +1074,9 @@ ohos_shared_library("ui_service_extension") {
deps = [
":abilitykit_native",
":extensionkit_native",
":ui_service_extension_connection",
"${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub",
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
"${ability_runtime_innerkits_path}/ability_manager:process_options",
@@ -1240,6 +1243,7 @@ ohos_shared_library("continuation_ipc") {
deps = [
":abilitykit_utils",
"${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub",
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
]
@@ -1267,8 +1271,6 @@ ohos_shared_library("continuation_ipc") {
defines += [ "BGTASKMGR_CONTINUOUS_TASK_ENABLE" ]
}
public_deps = []
innerapi_tags = [ "platformsdk_indirect" ]
subsystem_name = "ability"
part_name = "ability_runtime"
@@ -1285,7 +1287,10 @@ ohos_shared_library("data_ability_helper") {
configs = [ ":ability_config" ]
public_configs = [ ":ability_public_config" ]
deps = [ ":abilitykit_native" ]
deps = [
":abilitykit_native",
"${ability_runtime_napi_path}/inner/napi_common:napi_common",
]
external_deps = [
"ability_base:zuri",
@@ -1330,7 +1335,10 @@ ohos_shared_library("service_extension_module") {
configs = [ ":ability_config" ]
public_configs = [ ":ability_public_config" ]
deps = [ ":service_extension" ]
deps = [
":service_extension",
"${ability_runtime_innerkits_path}/runtime:runtime",
]
external_deps = [
"ability_base:configuration",
@@ -1478,8 +1486,6 @@ config("ui_extension_public_config") {
"${ability_runtime_path}/interfaces/kits/native/ability/native/insight_intent_executor",
"${ability_runtime_path}/interfaces/kits/native/ability/native/ui_extension_ability",
"${ability_runtime_path}/interfaces/kits/native/ability/native/ui_extension_base",
"${windowmanager_path}/interfaces/kits/napi/embeddable_window_stage",
"${windowmanager_path}/interfaces/kits/napi/extension_window",
]
}
@@ -1501,6 +1507,7 @@ ohos_shared_library("ui_extension") {
deps = [
":abilitykit_native",
":extensionkit_native",
":ui_service_extension_connection",
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
@@ -1683,6 +1690,7 @@ ohos_shared_library("share_extension") {
deps = [
":abilitykit_native",
":extensionkit_native",
":ui_extension",
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
@@ -1732,6 +1740,7 @@ ohos_shared_library("cj_share_extension") {
deps = [
":abilitykit_native",
":cj_ui_extension",
":extensionkit_native",
":share_extension",
":ui_extension",
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
@@ -1784,6 +1793,7 @@ ohos_shared_library("action_extension") {
deps = [
":abilitykit_native",
":extensionkit_native",
":ui_extension",
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
@@ -1834,6 +1844,7 @@ ohos_shared_library("cj_action_extension") {
":abilitykit_native",
":action_extension",
":cj_ui_extension",
":extensionkit_native",
":ui_extension",
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
@@ -2049,6 +2060,7 @@ ohos_shared_library("embedded_ui_extension") {
deps = [
":abilitykit_native",
":extensionkit_native",
":ui_extension",
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
@@ -2102,6 +2114,7 @@ ohos_shared_library("cj_embedded_ui_extension") {
":abilitykit_native",
":cj_ui_extension",
":embedded_ui_extension",
":extensionkit_native",
":ui_extension",
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
@@ -2195,6 +2208,7 @@ ohos_shared_library("auto_fill_extension") {
deps = [
":abilitykit_native",
":extensionkit_native",
":insight_intent_executor",
":ui_extension",
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
@@ -2315,6 +2329,7 @@ ohos_shared_library("photo_editor_extension") {
deps = [
":abilitykit_native",
":extensionkit_native",
":ui_extension",
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/runtime:runtime",
@@ -2373,6 +2388,7 @@ ohos_shared_library("cj_photo_editor_extension") {
":abilitykit_native",
":cj_extensionkit_native",
":cj_ui_extension",
":extensionkit_native",
":photo_editor_extension",
":ui_extension",
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
+2 -4
View File
@@ -94,10 +94,6 @@ ohos_shared_library("appkit_native") {
"${ability_runtime_utils_path}/global/constant",
]
if (ability_runtime_graphics) {
include_dirs += [ "${graphic_path}/frameworks/opengl_wrapper/src/EGL" ]
}
configs = [
":appkit_config",
":appkit_exception_config",
@@ -159,9 +155,11 @@ ohos_shared_library("appkit_native") {
"${ability_runtime_innerkits_path}/app_manager:app_manager",
"${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper",
"${ability_runtime_innerkits_path}/runtime:runtime",
"${ability_runtime_napi_path}/inner/napi_common:napi_common",
"${ability_runtime_native_path}/ability/native:ability_thread",
"${ability_runtime_native_path}/ability/native:abilitykit_native",
"${ability_runtime_native_path}/ability/native:configuration_helper",
"${ability_runtime_native_path}/ability/native:extensionkit_native",
"${ability_runtime_native_path}/ability/native:uiabilitykit_native",
"${ability_runtime_native_path}/appkit:app_context",
"${ability_runtime_native_path}/appkit:app_context_utils",
@@ -33,7 +33,6 @@ config("ability_manager_public_config") {
"${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context",
"${ability_runtime_path}/interfaces/kits/native/ability/native/continuation/kits",
"${ability_runtime_path}/interfaces/kits/native/ability/native/continuation/distributed",
"${bundlefwk_inner_api_path}/appexecfwk_base/include",
"${ability_runtime_innerkits_path}/ability_manager/include",
"${ability_runtime_innerkits_path}/app_manager/include/appmgr",
"${ability_runtime_path}/interfaces/kits/native/appkit/app",
@@ -397,7 +396,6 @@ ohos_shared_library("ability_connect_callback_stub") {
defines += [ "AMS_LOG_DOMAIN = 0xD001300" ]
include_dirs = [
"include/",
"${ability_base_kits_path}/want/include",
"${ability_runtime_services_path}/abilitymgr/include/utils",
"${ability_runtime_services_path}/abilitymgr/include",
"${ability_runtime_services_path}/common/include",
@@ -15,7 +15,6 @@
#include <gtest/gtest.h>
#include "js_environment.h"
#include "js_runtime.h"
#include "uncaught_exception_callback.h"
+1
View File
@@ -123,6 +123,7 @@ ohos_shared_library("abilityms") {
]
deps = [
":wantagent_manager",
"${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub",
"${ability_runtime_innerkits_path}/ability_manager:ability_manager",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
"${ability_runtime_innerkits_path}/ability_manager:ability_start_setting",
@@ -74,10 +74,12 @@ ohos_moduletest("ability_delegator_args_moduletest") {
external_deps = [
"ability_base:want",
"c_utils:utils",
"googletest:gmock",
"googletest:gmock_main",
"googletest:gtest_main",
"hilog:libhilog",
"ipc:ipc_core",
]
}
+3
View File
@@ -73,6 +73,7 @@ ohos_moduletest("ability_moduletest") {
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"c_utils:utils",
"eventhandler:libeventhandler",
"googletest:gmock_main",
"googletest:gtest_main",
"hilog:libhilog",
@@ -134,6 +135,7 @@ ohos_moduletest("ability_conetxt_test") {
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"c_utils:utils",
"eventhandler:libeventhandler",
"googletest:gmock_main",
"googletest:gtest_main",
"hilog:libhilog",
@@ -222,6 +224,7 @@ ohos_moduletest("data_ability_operation_moduletest") {
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"c_utils:utils",
"eventhandler:libeventhandler",
"googletest:gmock_main",
"googletest:gtest_main",
"hilog:libhilog",
@@ -59,6 +59,7 @@ ohos_moduletest("specified_ability_service_test") {
"common_event_service:cesfwk_core",
"common_event_service:cesfwk_innerkits",
"dsoftbus:softbus_client",
"eventhandler:libeventhandler",
"ffrt:libffrt",
"googletest:gmock_main",
"googletest:gtest_main",
@@ -56,6 +56,7 @@ ohos_moduletest("mission_dump_test") {
"c_utils:utils",
"common_event_service:cesfwk_innerkits",
"dsoftbus:softbus_client",
"eventhandler:libeventhandler",
"ffrt:libffrt",
"googletest:gmock_main",
"googletest:gtest_main",
@@ -16,8 +16,6 @@
#include <gtest/gtest.h>
#define private public
#define protected public
#include "iremote_object.h"
#include "iservice_registry.h"
#include "js_runtime.h"
#include "mock_runtime.h"
#include "runtime.h"
@@ -77,10 +77,12 @@ ohos_unittest("ability_delegator_args_unittest") {
external_deps = [
"ability_base:want",
"c_utils:utils",
"googletest:gmock",
"googletest:gmock_main",
"googletest:gtest_main",
"hilog:libhilog",
"ipc:ipc_core",
]
}
@@ -58,6 +58,7 @@ ohos_unittest("prepare_terminate_callback_proxy_test") {
"access_token:libaccesstoken_sdk",
"c_utils:utils",
"common_event_service:cesfwk_innerkits",
"eventhandler:libeventhandler",
"ffrt:libffrt",
"googletest:gmock_main",
"googletest:gtest_main",
@@ -53,6 +53,7 @@ ohos_unittest("resident_process_manager_test") {
"access_token:libaccesstoken_sdk",
"c_utils:utils",
"common_event_service:cesfwk_innerkits",
"eventhandler:libeventhandler",
"ffrt:libffrt",
"googletest:gmock_main",
"googletest:gtest_main",
+2
View File
@@ -30,8 +30,10 @@ ohos_unittest("startup_util_test") {
external_deps = [
"ability_base:want",
"bundle_framework:appexecfwk_base",
"c_utils:utils",
"googletest:gmock_main",
"googletest:gtest_main",
"ipc:ipc_core",
]
}
@@ -89,6 +89,7 @@ ohos_unittest("extension_record_manager_second_test") {
"c_utils:utils",
"common_event_service:cesfwk_innerkits",
"config_policy:configpolicy_util",
"eventhandler:libeventhandler",
"ffrt:libffrt",
"googletest:gmock_main",
"googletest:gtest_main",
@@ -82,6 +82,7 @@ ohos_unittest("extension_record_manager_test") {
"c_utils:utils",
"common_event_service:cesfwk_innerkits",
"config_policy:configpolicy_util",
"eventhandler:libeventhandler",
"ffrt:libffrt",
"googletest:gmock_main",
"googletest:gtest_main",
@@ -54,6 +54,7 @@ ohos_unittest("ui_service_extension_test") {
"ability_runtime:runtime",
"ace_engine:ace_uicontent",
"c_utils:utils",
"eventhandler:libeventhandler",
"googletest:gmock_main",
"googletest:gtest_main",
"hilog:libhilog",
@@ -60,6 +60,7 @@ ohos_unittest("ui_service_host_proxy_test") {
"ability_runtime:runtime",
"ace_engine:ace_uicontent",
"c_utils:utils",
"eventhandler:libeventhandler",
"ffrt:libffrt",
"googletest:gmock_main",
"googletest:gtest_main",
@@ -60,6 +60,7 @@ ohos_unittest("ui_service_proxy_test") {
"ability_runtime:runtime",
"ace_engine:ace_uicontent",
"c_utils:utils",
"eventhandler:libeventhandler",
"ffrt:libffrt",
"googletest:gmock_main",
"googletest:gtest_main",
@@ -45,6 +45,7 @@ ohos_unittest("unlock_screen_test") {
external_deps = [
"c_utils:utils",
"common_event_service:cesfwk_innerkits",
"eventhandler:libeventhandler",
"ffrt:libffrt",
"googletest:gmock_main",
"googletest:gtest_main",