!10331 部件依赖

Merge pull request !10331 from lpf/bjyl2
This commit is contained in:
openharmony_ci 2024-11-04 01:58:40 +00:00 committed by Gitee
commit 1bd8db15a6
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
27 changed files with 73 additions and 3 deletions

View File

@ -73,7 +73,8 @@
"libjpeg-turbo",
"libxml2",
"bounds_checking_function",
"device_status"
"device_status",
"ets_frontend"
],
"third_party": [
]

View File

@ -133,6 +133,7 @@ ohos_shared_library("libdm") {
external_deps = [
"ability_runtime:ability_manager",
"c_utils:utils",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
"hilog:libhilog",
"image_framework:image_native",
@ -193,6 +194,7 @@ ohos_shared_library("libdm_ndk") {
"c_utils:utils",
"hilog:libhilog",
"image_framework:pixelmap",
"ipc:ipc_core",
]
part_name = "window_manager"

View File

@ -70,6 +70,7 @@ ohos_shared_library("libdms") {
"c_utils:utils",
"config_policy:configpolicy_util",
"eventhandler:libeventhandler",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
"graphic_surface:surface",
"hilog:libhilog",
@ -77,6 +78,7 @@ ohos_shared_library("libdms") {
"ipc:ipc_single",
"libxml2:libxml2",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
defines = []

View File

@ -62,6 +62,7 @@ ohos_shared_library("libwindow_extension_client") {
"ability_runtime:ability_connect_callback_stub",
"ability_runtime:ability_manager",
"c_utils:utils",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
"hilog:libhilog",
"hitrace:hitrace_meter",

View File

@ -71,13 +71,16 @@ ohos_shared_library("libwindow_extension") {
"ability_runtime:extensionkit_native",
"ability_runtime:napi_common",
"ability_runtime:runtime",
"ability_runtime:wantagent_innerkits",
"c_utils:utils",
"common_event_service:cesfwk_innerkits",
"eventhandler:libeventhandler",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
"hilog:libhilog",
"hitrace:hitrace_meter",
"input:libmmi-client",
"ipc:ipc_napi",
"ipc:ipc_single",
"napi:ace_napi",
]

View File

@ -50,6 +50,7 @@ ohos_shared_library("cj_display_ffi") {
"ability_runtime:runtime",
"bounds_checking_function:libsec_shared",
"c_utils:utils",
"graphic_2d:2d_graphics_new",
"hilog:libhilog",
"hitrace:hitrace_meter",
"napi:ace_napi",

View File

@ -52,12 +52,14 @@ ohos_shared_library("cj_window_ffi") {
"ability_runtime:dialog_request_info",
"ability_runtime:extensionkit_native",
"ability_runtime:runtime",
"ability_runtime:wantagent_innerkits",
"access_token:libaccesstoken_sdk",
"ace_engine:ace_uicontent",
"bundle_framework:appexecfwk_base",
"c_utils:utils",
"common_event_service:cesfwk_innerkits",
"eventhandler:libeventhandler",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
"hilog:libhilog",
"hitrace:hitrace_meter",

View File

@ -100,8 +100,10 @@ ohos_shared_library("extensionwindow_napi") {
]
external_deps = [
"ability_runtime:ability_manager",
"ability_runtime:runtime",
"ace_engine:ace_uicontent",
"bundle_framework:appexecfwk_base",
"c_utils:utils",
"eventhandler:libeventhandler",
"hilog:libhilog",

View File

@ -49,6 +49,7 @@ ohos_shared_library("screen_napi") {
external_deps = [
"ability_runtime:runtime",
"c_utils:utils",
"graphic_2d:librender_service_base",
"graphic_surface:surface", # use for SurfaceUtils
"hilog:libhilog",
"hitrace:hitrace_meter",

View File

@ -114,6 +114,7 @@ ohos_shared_library("window_napi") {
cfi_vcall_icall_only = true
debug = false
}
defines = [ "SUPPORT_SCREEN" ]
sources = [
"window_manager_napi/js_window_manager.cpp",
"window_manager_napi/window_manager_module.cpp",
@ -137,8 +138,10 @@ ohos_shared_library("window_napi") {
"ability_runtime:ability_context_native",
"ability_runtime:abilitykit_native",
"ability_runtime:runtime",
"ability_runtime:wantagent_innerkits",
"c_utils:utils",
"common_event_service:cesfwk_innerkits",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
"hilog:libhilog",
"hitrace:hitrace_meter",
@ -177,6 +180,7 @@ ohos_shared_library("windowstage_kit") {
]
external_deps = [
"ability_runtime:ability_manager",
"ability_runtime:runtime",
"c_utils:utils",
"hilog:libhilog",

View File

@ -146,6 +146,10 @@ if (!ispreview) {
"napi:ace_napi",
]
if (!build_ohos_sdk && !is_mingw) {
external_deps += [ "ability_runtime:ability_manager" ]
}
cflags_cc = [ "-DWINDOW_PREVIEW" ]
cflags = [ "-std=c++11" ]

View File

@ -40,6 +40,7 @@ ohos_executable("setresolution_screen") {
external_deps = [
"c_utils:utils",
"graphic_2d:librender_service_base",
"graphic_surface:surface",
"init:libbegetutil",
]

View File

@ -199,6 +199,7 @@ ohos_shared_library("libwmutil") {
"c_utils:utils",
"eventhandler:libeventhandler",
"graphic_2d:2d_graphics",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
"graphic_surface:surface",
"hicollie:libhicollie",

View File

@ -15,6 +15,9 @@
#ifndef OHOS_ROSEN_WINDOW_TRANSITION_INFO_H
#define OHOS_ROSEN_WINDOW_TRANSITION_INFO_H
#ifndef SUPPORT_GRAPHICS
#define SUPPORT_GRAPHICS
#endif
#include <iremote_object.h>
#include <string>

View File

@ -46,6 +46,7 @@ ohos_shared_library("libintention_event") {
"eventhandler:libeventhandler",
"ffrt:libffrt",
"graphic_2d:libcomposer",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
"graphic_2d:window_animation",
"hicollie:libhicollie",
@ -54,6 +55,7 @@ ohos_shared_library("libintention_event") {
"hitrace:hitrace_meter",
"init:libbegetutil",
"input:libmmi-client",
"libxml2:libxml2",
]
defines = []

View File

@ -47,6 +47,7 @@ ohos_shared_library("intention_event_anr_manager") {
public_external_deps = [ "accessibility:accessibility_common" ]
external_deps = [
"ability_base:want",
"bundle_framework:appexecfwk_base",
"c_utils:utils",
"eventhandler:libeventhandler",
"hicollie:libhicollie",

View File

@ -61,6 +61,7 @@ ohos_shared_library("scenesessionmanager_napi") {
"c_utils:utils",
"eventhandler:libeventhandler",
"ffrt:libffrt",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
"hilog:libhilog",
"hitrace:hitrace_meter",
@ -68,7 +69,9 @@ ohos_shared_library("scenesessionmanager_napi") {
"image_framework:image_native",
"input:libmmi-client",
"ipc:ipc_single",
"libxml2:libxml2",
"napi:ace_napi",
"preferences:native_preferences",
]
defines = []

View File

@ -47,6 +47,7 @@ ohos_shared_library("screensessionmanager_napi") {
"ability_runtime:runtime",
"c_utils:utils",
"eventhandler:libeventhandler",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
"hilog:libhilog",
"hitrace:hitrace_meter",

View File

@ -48,8 +48,10 @@ ohos_shared_library("transactionmanager_napi") {
"ability_runtime:runtime",
"c_utils:utils",
"ffrt:libffrt",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
"hilog:libhilog",
"libxml2:libxml2",
"napi:ace_napi",
]

View File

@ -123,12 +123,14 @@ ohos_shared_library("screen_session_manager") {
"ability_runtime:app_manager",
"ability_runtime:dataobs_manager",
"ability_runtime:extension_manager",
"bundle_framework:appexecfwk_base",
"c_utils:utils",
"common_event_service:cesfwk_innerkits",
"config_policy:configpolicy_util",
"data_share:datashare_common",
"data_share:datashare_consumer",
"eventhandler:libeventhandler",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
"hicollie:libhicollie",
"hilog:libhilog",

View File

@ -83,9 +83,11 @@ ohos_shared_library("scene_session") {
"ability_runtime:start_window_option",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"bundle_framework:libappexecfwk_common",
"c_utils:utils",
"eventhandler:libeventhandler",
"ffrt:libffrt",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
"hilog:libhilog",
"hisysevent:libhisysevent",
@ -94,6 +96,7 @@ ohos_shared_library("scene_session") {
"init:libbegetutil",
"input:libmmi-client",
"ipc:ipc_single",
"samgr:samgr_proxy",
]
if (!(host_os == "linux" && host_cpu == "arm64")) {
external_deps += [ "preferences:native_preferences" ]
@ -177,6 +180,7 @@ ohos_shared_library("screen_session") {
external_deps = [
"c_utils:utils",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
"hicollie:libhicollie",
"hilog:libhilog",

View File

@ -114,11 +114,13 @@ ohos_shared_library("scene_session_manager") {
"ace_engine:ace_uicontent",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"bundle_framework:libappexecfwk_common",
"c_utils:utils",
"config_policy:configpolicy_util",
"dsoftbus:softbus_client",
"eventhandler:libeventhandler",
"ffrt:libffrt",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
"hicollie:libhicollie",
"hilog:libhilog",
@ -130,7 +132,9 @@ ohos_shared_library("scene_session_manager") {
"ipc:ipc_single",
"libxml2:libxml2",
"napi:ace_napi",
"preferences:native_preferences",
"resource_management:global_resmgr",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
]
@ -226,6 +230,7 @@ ohos_shared_library("session_manager") {
"ability_runtime:app_manager",
"ability_runtime:mission_info",
"c_utils:utils",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
"hilog:libhilog",
"image_framework:image_native",

View File

@ -21,6 +21,12 @@
#include <mutex>
#include <shared_mutex>
#ifndef OHOS_BUILD_ENABLE_SECURITY_COMPONENT // pointer_envent.h
#define OHOS_BUILD_ENABLE_SECURITY_COMPONENT
#endif
#ifndef SUPPORT_SCREEN
#define SUPPORT_SCREEN
#endif
#include "mission_snapshot.h"
#include "transaction/rs_interfaces.h"

View File

@ -20,6 +20,10 @@
#include <vector>
#include <list>
#include "pixel_map.h"
#ifndef SUPPORT_SCREEN
#define SUPPORT_SCREEN
#endif
#include "mission_listener_interface.h"
#include "ws_common.h"

View File

@ -12,7 +12,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef SUPPORT_SCREEN
#define SUPPORT_SCREEN
#endif
#include "session_manager/include/zidl/scene_session_manager_proxy.h"
#include <ipc_types.h>

View File

@ -119,6 +119,7 @@ ohos_static_library("libwm_static") {
"ace_engine:ace_uicontent",
"ace_engine:ace_xcomponent_controller",
"bundle_framework:appexecfwk_core",
"bundle_framework:libappexecfwk_common",
"c_utils:utils",
"eventhandler:libeventhandler",
"graphic_2d:librender_service_client",
@ -255,8 +256,10 @@ ohos_shared_library("libwm") {
"ace_engine:ace_uicontent",
"ace_engine:ace_xcomponent_controller",
"bundle_framework:appexecfwk_core",
"bundle_framework:libappexecfwk_common",
"c_utils:utils",
"eventhandler:libeventhandler",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
"graphic_2d:window_animation",
"hilog:libhilog",
@ -427,6 +430,7 @@ ohos_shared_library("libwm_ndk") {
"hilog:libhilog",
"input:libmmi-client",
"input:oh_input_manager",
"ipc:ipc_core",
]
part_name = "window_manager"

View File

@ -108,6 +108,7 @@ ohos_shared_library("sms") {
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"c_utils:utils",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
"hilog:libhilog",
"image_framework:image_native",
@ -148,7 +149,10 @@ if (window_manager_use_sceneboard) {
cfi_vcall_icall_only = true
debug = false
}
defines = []
defines = [
"SUPPORT_SCREEN",
"SUPPORT_GRAPHICS",
]
if (use_musl) {
if (musl_use_jemalloc && musl_use_jemalloc_dfx_intf) {
defines += [ "CONFIG_USE_JEMALLOC_DFX_INTF" ]
@ -216,6 +220,7 @@ if (window_manager_use_sceneboard) {
"common_event_service:cesfwk_innerkits",
"config_policy:configpolicy_util",
"eventhandler:libeventhandler",
"graphic_2d:librender_service_base",
"graphic_2d:librender_service_client",
"graphic_2d:window_animation",
"hicollie:libhicollie",
@ -226,6 +231,7 @@ if (window_manager_use_sceneboard) {
"input:libmmi-client",
"ipc:ipc_single",
"libxml2:libxml2",
"preferences:native_preferences",
"safwk:system_ability_fwk",
]