From 6a3d65c39245d26bb3b85326e01264024bdff74c Mon Sep 17 00:00:00 2001 From: ShaoboFeng Date: Wed, 21 Jun 2023 19:00:39 +0800 Subject: [PATCH 1/2] renderservice_client build rs client so change "//display_service/" to "$display_server_root/" fix code review --- build/gn/BUILD.gn | 3 + build/gn/configs/system_libs/BUILD.gn | 5 + .../display_device/hdi_session.cpp | 8 +- display_server/ft_configs/ds_config.gni | 2 +- .../rosen/modules/composer/ft_build/BUILD.gn | 85 +++++++++++ .../composer/hdi_backend/include/hdi_layer.h | 1 + .../modules/composer/vsync/ft_build/BUILD.gn | 30 ++-- .../modules/frame_analyzer/ft_build/BUILD.gn | 55 +++++++ .../frame_analyzer/src/frame_saver.cpp | 2 + .../render_frame_trace/ft_build/BUILD.gn | 20 +++ .../src/platform/fangtian/BUILD.gn | 5 +- .../platform/fangtian/rs_accessibility.cpp | 54 +------ .../core/jank_detector/rs_jank_detector.cpp | 2 +- .../core/pipeline/rs_render_thread.cpp | 1 - .../render_service_client/ft_build/BUILD.gn | 141 ++++++++++++++++++ 15 files changed, 342 insertions(+), 72 deletions(-) create mode 100644 display_server/rosen/modules/composer/ft_build/BUILD.gn create mode 100644 display_server/rosen/modules/frame_analyzer/ft_build/BUILD.gn create mode 100644 display_server/rosen/modules/render_frame_trace/ft_build/BUILD.gn create mode 100644 display_server/rosen/modules/render_service_client/ft_build/BUILD.gn diff --git a/build/gn/BUILD.gn b/build/gn/BUILD.gn index f9fbd9b..f3a53d2 100644 --- a/build/gn/BUILD.gn +++ b/build/gn/BUILD.gn @@ -19,6 +19,9 @@ group("ft_engine") { "//display_server/utils/sync_fence/ft_build:sync_fence", "//display_server/frameworks/surface/ft_build:surface", "//display_server/rosen/modules/render_service_base/ft_build:librender_service_base", + "//display_server/drivers/hdi_service/gralloc/client:hdi_gralloc_client", + "//display_server/rosen/modules/composer/ft_build:libcomposer", + "//display_server/rosen/modules/render_service_client/ft_build:librender_service_client", "//window_manager/utils/ft_build:libwmutil", "//window_manager/dm/ft_build:libdm", diff --git a/build/gn/configs/system_libs/BUILD.gn b/build/gn/configs/system_libs/BUILD.gn index 5b3ccc8..c3b9cbc 100644 --- a/build/gn/configs/system_libs/BUILD.gn +++ b/build/gn/configs/system_libs/BUILD.gn @@ -55,3 +55,8 @@ config("mmi_config") { include_dirs = [ "${sys_inc}/mmi" ] libs = [ "mmi-client" ] } + +config("syspara_config") { + include_dirs = [ "${sys_inc}/syspara" ] + libs = [ "beget_proxy", "begetutil" ] +} diff --git a/display_server/drivers/hal/drm_backend/display_device/hdi_session.cpp b/display_server/drivers/hal/drm_backend/display_device/hdi_session.cpp index 613ecb6..a839a5d 100644 --- a/display_server/drivers/hal/drm_backend/display_device/hdi_session.cpp +++ b/display_server/drivers/hal/drm_backend/display_device/hdi_session.cpp @@ -549,10 +549,10 @@ int32_t DeviceInitialize(DeviceFuncs **funcs) return DISPLAY_SUCCESS; } -int32_t DeviceUnInitialize(DeviceFuncs *funcs) +int32_t DeviceUninitialize(DeviceFuncs *funcs) { if (funcs == nullptr) { - LOG_ERROR("DeviceUnInitialize: param funcs is nullptr."); + LOG_ERROR("DeviceUninitialize: param funcs is nullptr."); return DISPLAY_PARAM_ERR; } @@ -596,10 +596,10 @@ int32_t LayerInitialize(LayerFuncs **funcs) return DISPLAY_SUCCESS; } -int32_t LayerUnInitialize(LayerFuncs *funcs) +int32_t LayerUninitialize(LayerFuncs *funcs) { if (funcs == nullptr) { - LOG_ERROR("LayerUnInitialize: param funcs is nullptr."); + LOG_ERROR("LayerUninitialize: param funcs is nullptr."); return DISPLAY_PARAM_ERR; } diff --git a/display_server/ft_configs/ds_config.gni b/display_server/ft_configs/ds_config.gni index 1f7e7da..da6dfdc 100644 --- a/display_server/ft_configs/ds_config.gni +++ b/display_server/ft_configs/ds_config.gni @@ -15,4 +15,4 @@ display_server_root = "//display_server" rosen_root = "//display_server/rosen" rs_enable_gpu = false ace_enable_gpu = false -gpu_defines = [] +gpu_defines = [] \ No newline at end of file diff --git a/display_server/rosen/modules/composer/ft_build/BUILD.gn b/display_server/rosen/modules/composer/ft_build/BUILD.gn new file mode 100644 index 0000000..13804e5 --- /dev/null +++ b/display_server/rosen/modules/composer/ft_build/BUILD.gn @@ -0,0 +1,85 @@ +# Copyright (c) 2023 Huawei Technologies Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/gn/fangtian.gni") +import("//display_server/ft_configs/ds_config.gni") + +config("composer_config") { + visibility = [ ":*" ] + + cflags = [ + "-Wall", + "-Werror", + "-g3", + "-Wno-c++11-narrowing" + ] +} + +config("composer_public_config") { + include_dirs = [ + "$display_server_root/rosen/include/common", + "$display_server_root/drivers/interfaces", + "$display_server_root/interfaces/inner_api/common", + "$display_server_root/interfaces/inner_api/surface", + "$display_server_root/rosen/modules/composer/hdi_backend/include", + "$display_server_root/rosen/modules/composer/vsync/include", + "$display_server_root/interfaces/inner_api/composer", + "$display_server_root/rosen/modules/render_service_base/include" + ] +} + +ft_shared_library("libcomposer") { + sources = [ + "../hdi_backend/src/hdi_backend.cpp", + "../hdi_backend/src/hdi_device.cpp", + "../hdi_backend/src/hdi_framebuffer_surface.cpp", + "../hdi_backend/src/hdi_layer.cpp", + "../hdi_backend/src/hdi_output.cpp", + "../hdi_backend/src/hdi_screen.cpp", + ] + + include_dirs = [ + "$display_server_root/rosen/modules/render_frame_trace/include", + "$display_server_root/rosen/modules/render_service_base/src", + "$display_server_root/utils/log", + ] + + configs = [ + ":composer_config", + "//build/gn/configs/system_libs:hilog_config", + "//build/gn/configs/system_libs:ipc_core_config", + "//build/gn/configs/system_libs:c_utils_config", + ] + + defines = [] + defines += gpu_defines + + public_configs = [ + ":composer_public_config", + ] + + deps = [ + "$display_server_root/frameworks/surface/ft_build:surface", + "$display_server_root/rosen/modules/render_frame_trace/ft_build:render_frame_trace", + "$display_server_root/rosen/modules/render_service_base/ft_build:librender_service_base", + ] + + public_deps = [ + "../vsync/ft_build:libvsync", + "$display_server_root/utils/buffer_handle/ft_build:buffer_handle", + "$display_server_root/utils/scoped_bytrace/ft_build:scoped_bytrace", + "$display_server_root/utils/sync_fence/ft_build:sync_fence", + "$display_server_root/drivers/hal/drm_backend/display_device:display_device", + "$display_server_root/drivers/hal/drm_backend/display_gralloc:display_gralloc", + ] +} \ No newline at end of file diff --git a/display_server/rosen/modules/composer/hdi_backend/include/hdi_layer.h b/display_server/rosen/modules/composer/hdi_backend/include/hdi_layer.h index 03634de..aa51bad 100644 --- a/display_server/rosen/modules/composer/hdi_backend/include/hdi_layer.h +++ b/display_server/rosen/modules/composer/hdi_backend/include/hdi_layer.h @@ -16,6 +16,7 @@ #ifndef HDI_BACKEND_HDI_LAYER_H #define HDI_BACKEND_HDI_LAYER_H +#include #include #include #include diff --git a/display_server/rosen/modules/composer/vsync/ft_build/BUILD.gn b/display_server/rosen/modules/composer/vsync/ft_build/BUILD.gn index f05185e..c233ffe 100644 --- a/display_server/rosen/modules/composer/vsync/ft_build/BUILD.gn +++ b/display_server/rosen/modules/composer/vsync/ft_build/BUILD.gn @@ -12,17 +12,18 @@ # limitations under the License. import("//build/gn/fangtian.gni") +import("//display_server/ft_configs/ds_config.gni") config("vsync_config") { visibility = [ ":*" ] include_dirs = [ - "${sys_inc}/c_utils", - "${sys_inc}/ipc_core", - "${sys_inc}/eventhandler", - "${sys_inc}/hilog", - "//display_server/utils/log", - "//display_server/interfaces/inner_api/common", - "//display_server/rosen/modules/composer/vsync/include", + "$display_server_root/utils/log", + "$display_server_root/interfaces/inner_api/common", + "$rosen_root/modules/composer/vsync/include", + "$display_server_root/interfaces/inner_api/composer", + "$rosen_root/include/common", + "$display_server_root/utils/sandbox", + "$display_server_root/utils/socketpair/export", ] cflags = [ "-Wall", @@ -30,16 +31,11 @@ config("vsync_config") { "-g3", "-Wno-c++11-narrowing" ] - libs = ["ipc_core", "eventhandler", "hilog", "utils"] } config("vsync_public_config") { include_dirs = [ - "//display_server/interfaces/inner_api/composer", - "//display_server/rosen/include/common", - "//display_server/rosen/modules/composer/vsync/include", - "//display_server/utils/sandbox", - "//display_server/utils/socketpair/export", + "$rosen_root/modules/composer/vsync/include", ] } @@ -54,7 +50,13 @@ ft_shared_library("libvsync") { "../src/vsync_sampler.cpp", ] - configs = [ ":vsync_config" ] + configs = [ + ":vsync_config", + "//build/gn/configs/system_libs:eventhandler_config", + "//build/gn/configs/system_libs:ipc_core_config", + "//build/gn/configs/system_libs:c_utils_config", + "//build/gn/configs/system_libs:hilog_config", + ] public_configs = [ ":vsync_public_config", diff --git a/display_server/rosen/modules/frame_analyzer/ft_build/BUILD.gn b/display_server/rosen/modules/frame_analyzer/ft_build/BUILD.gn new file mode 100644 index 0000000..131082a --- /dev/null +++ b/display_server/rosen/modules/frame_analyzer/ft_build/BUILD.gn @@ -0,0 +1,55 @@ +# Copyright (c) 2021 Huawei Technologies Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/gn/fangtian.gni") +import("//display_server/ft_configs/ds_config.gni") + +config("libframe_analyzer_config") { + visibility = [ ":*" ] + + cflags = [ + "-Wall", + "-Werror", + "-g3", + "-Wno-c++11-narrowing", + ] +} + +config("libframe_analyzer_public_config") { + include_dirs = [ "../export" ] +} + +ft_shared_library("libframe_analyzer") { + sources = [ + "../src/frame_collector.cpp", + "../src/frame_painter.cpp", + "../src/frame_saver.cpp", + ] + + include_dirs = [ "//foundation/graphic/graphic_2d/utils/sandbox" ] + + deps = [ + "$display_server_root/utils/sandbox/ft_build:sandbox_utils", + ] + + configs = [ + ":libframe_analyzer_config", + "//build/gn/configs/system_libs:hitrace_meter_config", + "//build/gn/configs/system_libs:hilog_config", + "//build/gn/configs/system_libs:c_utils_config", + "//build/gn/configs/system_libs:skia_config", + "//build/gn/configs/system_libs:syspara_config", + ] + + public_configs = [ ":libframe_analyzer_public_config" ] +} diff --git a/display_server/rosen/modules/frame_analyzer/src/frame_saver.cpp b/display_server/rosen/modules/frame_analyzer/src/frame_saver.cpp index 7046e2b..501275f 100644 --- a/display_server/rosen/modules/frame_analyzer/src/frame_saver.cpp +++ b/display_server/rosen/modules/frame_analyzer/src/frame_saver.cpp @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include #include diff --git a/display_server/rosen/modules/render_frame_trace/ft_build/BUILD.gn b/display_server/rosen/modules/render_frame_trace/ft_build/BUILD.gn new file mode 100644 index 0000000..a55d203 --- /dev/null +++ b/display_server/rosen/modules/render_frame_trace/ft_build/BUILD.gn @@ -0,0 +1,20 @@ +# Copyright (c) 2023 Huawei Technologies Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/gn/fangtian.gni") + +ft_source_set("render_frame_trace") { + include_dirs = [ "../include" ] + sources = [ "../src/render_frame_trace.cpp" ] + cflags = [ "-fstack-protector-all" ] +} diff --git a/display_server/rosen/modules/render_service_base/src/platform/fangtian/BUILD.gn b/display_server/rosen/modules/render_service_base/src/platform/fangtian/BUILD.gn index b076446..3048b31 100644 --- a/display_server/rosen/modules/render_service_base/src/platform/fangtian/BUILD.gn +++ b/display_server/rosen/modules/render_service_base/src/platform/fangtian/BUILD.gn @@ -46,6 +46,7 @@ ft_source_set("rosen_fangtian_sources") { #backend "backend/rs_surface_frame_raster.cpp", "backend/rs_surface_raster.cpp", + "rs_accessibility.cpp", "rs_ashmem_helper.cpp", #overdraw @@ -93,9 +94,8 @@ ft_source_set("rosen_fangtian_sources") { "$rosen_root/modules/render_service_base/src/platform/fangtian/include", "$rosen_root/modules/platform/image_native", "$rosen_root/modules/render_service_base/src", - "//utils/system/safwk/native/include", - "//drivers/peripheral/display/interfaces/include/", "$display_server_root/utils/log", + "$display_server_root/interfaces/inner_api/composer", ] deps = [ @@ -103,6 +103,7 @@ ft_source_set("rosen_fangtian_sources") { "$rosen_root/modules/composer/vsync/ft_build:libvsync", "$display_server_root/utils/sync_fence/ft_build:sync_fence", "$display_server_root/utils/buffer_handle/ft_build:buffer_handle", + "$display_server_root/utils/sandbox/ft_build:sandbox_utils", ] if (rs_enable_gpu) { diff --git a/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_accessibility.cpp b/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_accessibility.cpp index 0b7063f..cd7fc5e 100644 --- a/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_accessibility.cpp +++ b/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_accessibility.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Huawei Technologies Co., Ltd. + * Copyright (c) 2023 Huawei Technologies Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,65 +15,21 @@ #include "platform/common/rs_accessibility.h" -#include "accessibility_config.h" -#include "platform/common/rs_log.h" - -using namespace OHOS::AccessibilityConfig; - namespace OHOS { namespace Rosen { -class RSAccessibilityOHOS : public RSAccessibility { +class RSAccessibilityFangTian : public RSAccessibility { public: - static RSAccessibilityOHOS &GetInstance(); void ListenHighContrastChange(OnHighContrastChange callback) override; - -private: - class Observer : public AccessibilityConfigObserver { - public: - virtual void OnConfigChanged(const CONFIG_ID id, const ConfigValue &value) override; - }; - - void ListenHighContrast(); - - std::shared_ptr observer_ = std::make_shared(); - bool listeningHighContrast_ = false; - OnHighContrastChange onHighContrastChange_ = nullptr; }; -RSAccessibilityOHOS &RSAccessibilityOHOS::GetInstance() -{ - static RSAccessibilityOHOS instance; - return instance; -} - RSAccessibility &RSAccessibility::GetInstance() { - return RSAccessibilityOHOS::GetInstance(); -} - -void RSAccessibilityOHOS::ListenHighContrastChange(OnHighContrastChange callback) -{ - onHighContrastChange_ = callback; - ListenHighContrast(); -} - -void RSAccessibilityOHOS::ListenHighContrast() -{ - if (!listeningHighContrast_) { - auto &config = OHOS::AccessibilityConfig::AccessibilityConfig::GetInstance(); - config.InitializeContext(); - config.SubscribeConfigObserver(CONFIG_ID::CONFIG_HIGH_CONTRAST_TEXT, observer_); - listeningHighContrast_ = true; - } + static RSAccessibilityWindows instance; + return instance; } -void RSAccessibilityOHOS::Observer::OnConfigChanged(const CONFIG_ID id, const ConfigValue &value) +void RSAccessibilityWindows::ListenHighContrastChange(OnHighContrastChange callback) { - ROSEN_LOGD("OnConfigChanged %d", static_cast(id)); - auto &accessbility = RSAccessibilityOHOS::GetInstance(); - if (id == CONFIG_ID::CONFIG_HIGH_CONTRAST_TEXT && accessbility.onHighContrastChange_) { - accessbility.onHighContrastChange_(value.highContrastText); - } } } // namespace Rosen } // namespace OHOS diff --git a/display_server/rosen/modules/render_service_client/core/jank_detector/rs_jank_detector.cpp b/display_server/rosen/modules/render_service_client/core/jank_detector/rs_jank_detector.cpp index fa572f4..250e077 100644 --- a/display_server/rosen/modules/render_service_client/core/jank_detector/rs_jank_detector.cpp +++ b/display_server/rosen/modules/render_service_client/core/jank_detector/rs_jank_detector.cpp @@ -17,7 +17,7 @@ #include #ifdef ROSEN_OHOS -#include "base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include/hisysevent.h" +#include "hisysevent.h" #include "sandbox_utils.h" #endif diff --git a/display_server/rosen/modules/render_service_client/core/pipeline/rs_render_thread.cpp b/display_server/rosen/modules/render_service_client/core/pipeline/rs_render_thread.cpp index b8af45f..3213e30 100644 --- a/display_server/rosen/modules/render_service_client/core/pipeline/rs_render_thread.cpp +++ b/display_server/rosen/modules/render_service_client/core/pipeline/rs_render_thread.cpp @@ -45,7 +45,6 @@ #ifdef ROSEN_OHOS #include #include -#include "accessibility_config.h" #include "frame_collector.h" #include "render_frame_trace.h" #include "platform/ohos/overdraw/rs_overdraw_controller.h" diff --git a/display_server/rosen/modules/render_service_client/ft_build/BUILD.gn b/display_server/rosen/modules/render_service_client/ft_build/BUILD.gn new file mode 100644 index 0000000..91881d1 --- /dev/null +++ b/display_server/rosen/modules/render_service_client/ft_build/BUILD.gn @@ -0,0 +1,141 @@ +# Copyright (c) 2021-2023 Huawei Technologies Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/gn/fangtian.gni") +import("//display_server/ft_configs/ds_config.gni") + +config("render_service_client_config") { + include_dirs = [ + "$rosen_root/modules", + "$rosen_root/modules/render_service_client/core", + "$rosen_root/modules/render_service_base/include", + "$rosen_root/modules/render_service_base/src/platform/fangtian/include", + "$rosen_root/modules/platform/image_native", + "$display_server_root/interfaces/inner_api/common", + "$display_server_root/interfaces/inner_api/surface", + "$display_server_root/interfaces/inner_api/composer", + #"//drivers/peripheral/display/interfaces/include", + #"//drivers/peripheral/base", + ] + defines = [ "ROSEN_OHOS" ] +} + +ft_source_set("render_service_client_src") { + defines = [] + defines += gpu_defines + defines += [ "MODULE_RSC" ] + include_dirs = [ + "$rosen_root/modules/2d_graphics/src", + "$rosen_root/modules/render_frame_trace/include", + "$rosen_root/modules/render_service_base/src", + "$display_server_root/utils/log", + "$display_server_root/utils/sandbox", + ] + + sources = [ + #animation + "../core/animation/rs_animation.cpp", + "../core/animation/rs_animation_callback.cpp", + "../core/animation/rs_animation_group.cpp", + "../core/animation/rs_animation_manager_map.cpp", + "../core/animation/rs_animation_timing_curve.cpp", + "../core/animation/rs_curve_animation.cpp", + "../core/animation/rs_implicit_animation_param.cpp", + "../core/animation/rs_implicit_animator.cpp", + "../core/animation/rs_implicit_animator_map.cpp", + "../core/animation/rs_keyframe_animation.cpp", + "../core/animation/rs_path_animation.cpp", + "../core/animation/rs_property_animation.cpp", + "../core/animation/rs_spring_animation.cpp", + "../core/animation/rs_transition.cpp", + "../core/animation/rs_ui_animation_manager.cpp", + + #modifier + "../core/modifier/rs_extended_modifier.cpp", + "../core/modifier/rs_modifier_extractor.cpp", + "../core/modifier/rs_modifier_manager.cpp", + "../core/modifier/rs_property.cpp", + "../core/modifier/rs_property_modifier.cpp", + + #jank_detector + "../core/jank_detector/rs_jank_detector.cpp", + + #pipeline + "../core/pipeline/rs_node_map.cpp", + "../core/pipeline/rs_render_thread.cpp", + "../core/pipeline/rs_render_thread_visitor.cpp", + + #transaction + "../core/transaction/rs_application_agent_impl.cpp", + "../core/transaction/rs_interfaces.cpp", + "../core/transaction/rs_render_thread_client.cpp", + "../core/transaction/rs_transaction.cpp", + + #ui + "../core/ui/rs_base_node.cpp", + "../core/ui/rs_canvas_node.cpp", + "../core/ui/rs_display_node.cpp", + "../core/ui/rs_node.cpp", + "../core/ui/rs_pixel_map_util.cpp", + "../core/ui/rs_proxy_node.cpp", + "../core/ui/rs_root_node.cpp", + "../core/ui/rs_surface_extractor.cpp", + "../core/ui/rs_surface_node.cpp", + "../core/ui/rs_ui_director.cpp", + "../core/ui/rs_ui_share_context.cpp", + ] + + cflags = [ + "-Wall", + "-Wno-pointer-arith", + "-Wno-non-virtual-dtor", + "-Wno-missing-field-initializers", + "-Wno-c++11-narrowing", + "-fvisibility=hidden", + ] + + cflags_cc = [ + "-std=c++17", + "-fvisibility-inlines-hidden", + ] + + #if (enable_export_macro) { + # defines += [ "ENABLE_EXPORT_MACRO" ] + #} + + deps = [ + "$rosen_root/modules/composer/vsync/ft_build:libvsync", + "$rosen_root/modules/frame_analyzer/ft_build:libframe_analyzer", + "$rosen_root/modules/render_frame_trace/ft_build:render_frame_trace", + "$rosen_root/modules/render_service_base/ft_build:librender_service_base", + "$display_server_root/utils/buffer_handle/ft_build:buffer_handle", + "$display_server_root/utils/sync_fence/ft_build:sync_fence", + "$display_server_root/utils/sandbox/ft_build:sandbox_utils", + ] + + public_configs = [ ":render_service_client_config" ] + + configs = [ + "//build/gn/configs/system_libs:eventhandler_config", + "//build/gn/configs/system_libs:ipc_core_config", + "//build/gn/configs/system_libs:c_utils_config", + "//build/gn/configs/system_libs:skia_config", + "//build/gn/configs/system_libs:hitrace_meter_config", + ] +} + +ft_shared_library("librender_service_client") { + public_deps = [ + ":render_service_client_src", + ] +} -- Gitee From 9e59e03b25129837947b07ff55e7b568fee2fa1d Mon Sep 17 00:00:00 2001 From: ShaoboFeng Date: Sat, 24 Jun 2023 17:00:09 +0800 Subject: [PATCH 2/2] fix rs accessiility hook build --- .../src/platform/fangtian/rs_accessibility.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_accessibility.cpp b/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_accessibility.cpp index cd7fc5e..20f0bf0 100644 --- a/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_accessibility.cpp +++ b/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_accessibility.cpp @@ -24,11 +24,11 @@ public: RSAccessibility &RSAccessibility::GetInstance() { - static RSAccessibilityWindows instance; + static RSAccessibilityFangTian instance; return instance; } -void RSAccessibilityWindows::ListenHighContrastChange(OnHighContrastChange callback) +void RSAccessibilityFangTian::ListenHighContrastChange(OnHighContrastChange callback) { } } // namespace Rosen -- Gitee