diff --git a/display/hal/BUILD.gn b/display/hal/BUILD.gn index 4c2f13b9c3b2efb46e95e3ad1db96db15cf331b9..a232730b0501aef2f68ee1ee680599b59c847411 100644 --- a/display/hal/BUILD.gn +++ b/display/hal/BUILD.gn @@ -12,14 +12,10 @@ # limitations under the License. if (defined(ohos_lite)) { - import("//build/lite/config/component/lite_component.gni") - group("hdi_display") { public_deps = [ "//device/${device_company}/hardware/display:hdi_display" ] } } else { - import("//build/ohos.gni") - config("display_hdi_public_config") { visibility = [ ":*" ] include_dirs = [ @@ -35,27 +31,31 @@ if (defined(ohos_lite)) { ":hdi_display_gfx", ":hdi_display_gralloc", ":hdi_display_layer", + "//drivers/peripheral/display/interfaces/hdi_cpp/client:display_client", ] + if (target_cpu == "arm") { + deps += [ "//drivers/peripheral/display/interfaces/hdi_cpp/server:display_service" ] + } public_configs = [ ":display_hdi_public_config" ] } group("hdi_display_device") { - deps = [ "//device/hisilicon/hardware/display/libs:display_device" ] + deps = [ "//device/hisilicon/hardware/display:display_device" ] public_configs = [ ":display_hdi_public_config" ] } - group("hdi_display_gfx") { - deps = [ "//device/hisilicon/hardware/display/libs:display_gfx" ] + group("hdi_display_gralloc") { + deps = [ "//device/hisilicon/hardware/display:display_gralloc" ] public_configs = [ ":display_hdi_public_config" ] } - group("hdi_display_gralloc") { - deps = [ "//device/hisilicon/hardware/display/libs:display_gralloc" ] + group("hdi_display_gfx") { + deps = [ "//device/hisilicon/hardware/display:display_gfx" ] public_configs = [ ":display_hdi_public_config" ] } group("hdi_display_layer") { - deps = [ "//device/hisilicon/hardware/display/libs:display_layer" ] + deps = [ "//device/hisilicon/hardware/display:display_layer" ] public_configs = [ ":display_hdi_public_config" ] } } diff --git a/display/interfaces/hdi_cpp/server/BUILD.gn b/display/interfaces/hdi_cpp/server/BUILD.gn index 961695d24dac7c10c78e287dcccc3e93810f38d0..483e0bb7c6ba39cda0d24948aba33a4185a56f2f 100644 --- a/display/interfaces/hdi_cpp/server/BUILD.gn +++ b/display/interfaces/hdi_cpp/server/BUILD.gn @@ -39,10 +39,13 @@ if (is_standard_system) { "//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", ] + if (target_cpu == "arm") { + deps += [ "//drivers/peripheral/display/hal:hdi_display_layer" ] + } + if (is_standard_system) { external_deps = [ "hiviewdfx_hilog_native:libhilog",