From 44a5215cd6a8280eac643b38de47be3362216b20 Mon Sep 17 00:00:00 2001 From: JasonYujia Date: Wed, 14 Jul 2021 08:26:54 +0000 Subject: [PATCH] Adapter the build of hdi servitization for L35 Signed-off-by: JasonYujia --- display/interfaces/hdi_cpp/client/BUILD.gn | 50 ++++++++--------- display/interfaces/hdi_cpp/server/BUILD.gn | 62 +++++++++++----------- 2 files changed, 58 insertions(+), 54 deletions(-) diff --git a/display/interfaces/hdi_cpp/client/BUILD.gn b/display/interfaces/hdi_cpp/client/BUILD.gn index 2743419dbe..efedbf5838 100644 --- a/display/interfaces/hdi_cpp/client/BUILD.gn +++ b/display/interfaces/hdi_cpp/client/BUILD.gn @@ -20,32 +20,34 @@ group("display_client") { } } -ohos_shared_library("libhdi_display_layer_client") { - include_dirs = [ - "../../include", - "//drivers/peripheral/base", - ] - - sources = [ "display_layer_proxy.cpp" ] +if (is_standard_system) { + ohos_shared_library("libhdi_display_layer_client") { + include_dirs = [ + "../../include", + "//drivers/peripheral/base", + ] - deps = [ - "$hdf_uhdf_path/hdi:libhdi", - "//drivers/adapter/uhdf2/host:libhdf_host", - "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", - "//foundation/graphic/standard/utils:buffer_handle", - ] + sources = [ "display_layer_proxy.cpp" ] - if (is_standard_system) { - external_deps = [ - "hiviewdfx_hilog_native:libhilog", - "ipc:ipc_core", + deps = [ + "$hdf_uhdf_path/hdi:libhdi", + "//drivers/adapter/uhdf2/host:libhdf_host", + "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", + "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//foundation/graphic/standard/utils:buffer_handle", ] - } else { - external_deps = [ "hilog:libhilog" ] - } - # install_images = [ "vendor" ] - subsystem_name = "hdf" - part_name = "hdf" + if (is_standard_system) { + external_deps = [ + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + ] + } else { + external_deps = [ "hilog:libhilog" ] + } + + # install_images = [ "vendor" ] + subsystem_name = "hdf" + part_name = "hdf" + } } diff --git a/display/interfaces/hdi_cpp/server/BUILD.gn b/display/interfaces/hdi_cpp/server/BUILD.gn index 0038a322cd..961695d24d 100644 --- a/display/interfaces/hdi_cpp/server/BUILD.gn +++ b/display/interfaces/hdi_cpp/server/BUILD.gn @@ -20,38 +20,40 @@ group("display_service") { } } -ohos_shared_library("libhdi_display_layer_service") { - include_dirs = [ - "../../include", - "//drivers/peripheral/base", - ] - - sources = [ - "display_hdi_driver.cpp", - "display_layer_service_impl.cpp", - "display_layer_service_stub.cpp", - ] +if (is_standard_system) { + ohos_shared_library("libhdi_display_layer_service") { + include_dirs = [ + "../../include", + "//drivers/peripheral/base", + ] - deps = [ - "$hdf_uhdf_path/hdi:libhdi", - "//drivers/adapter/uhdf2/host:libhdf_host", - "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", - "//drivers/peripheral/display/hal:hdi_display_gralloc", - "//drivers/peripheral/display/hal:hdi_display_layer", - "//foundation/graphic/standard/utils:buffer_handle", - ] + sources = [ + "display_hdi_driver.cpp", + "display_layer_service_impl.cpp", + "display_layer_service_stub.cpp", + ] - if (is_standard_system) { - external_deps = [ - "hiviewdfx_hilog_native:libhilog", - "ipc:ipc_core", + deps = [ + "$hdf_uhdf_path/hdi:libhdi", + "//drivers/adapter/uhdf2/host:libhdf_host", + "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", + "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/peripheral/display/hal:hdi_display_gralloc", + "//drivers/peripheral/display/hal:hdi_display_layer", + "//foundation/graphic/standard/utils:buffer_handle", ] - } else { - external_deps = [ "hilog:libhilog" ] - } - # install_images = [ "vendor" ] - subsystem_name = "hdf" - part_name = "hdf" + if (is_standard_system) { + external_deps = [ + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + ] + } else { + external_deps = [ "hilog:libhilog" ] + } + + # install_images = [ "vendor" ] + subsystem_name = "hdf" + part_name = "hdf" + } } -- Gitee