From fa7b0189f2e43d17ffe89537c32f2266d6744a65 Mon Sep 17 00:00:00 2001 From: yanansong Date: Mon, 11 Dec 2023 09:46:14 +0800 Subject: [PATCH] adjust for building rpm --- .../modules/render_service_client/test/ft_build/BUILD.gn | 1 - display_server/utils/buffer_handle/ft_build/BUILD.gn | 8 +++++--- display_server/utils/scoped_bytrace/ft_build/BUILD.gn | 9 ++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/display_server/rosen/modules/render_service_client/test/ft_build/BUILD.gn b/display_server/rosen/modules/render_service_client/test/ft_build/BUILD.gn index c904166..73a0852 100644 --- a/display_server/rosen/modules/render_service_client/test/ft_build/BUILD.gn +++ b/display_server/rosen/modules/render_service_client/test/ft_build/BUILD.gn @@ -43,7 +43,6 @@ ft_executable("render_service_client_rs_demo") { "//display_server/rosen/modules/render_service_client/ft_build:librender_service_client", "//build/gn/configs/system_libs:hilog", - "//build/gn/configs/system_libs:libz", "//build/gn/configs/system_libs:skia", "//build/gn/configs/system_libs:image", ] diff --git a/display_server/utils/buffer_handle/ft_build/BUILD.gn b/display_server/utils/buffer_handle/ft_build/BUILD.gn index 443b947..bd4835b 100644 --- a/display_server/utils/buffer_handle/ft_build/BUILD.gn +++ b/display_server/utils/buffer_handle/ft_build/BUILD.gn @@ -21,9 +21,6 @@ config("buffer_handle_public") { ft_static_library("buffer_handle") { include_dirs = [ - "${sys_inc}/c_utils", - "${sys_inc}/ipc_core", - "${sys_inc}/hilog", "${usr_inc}/ftsurface", ] public_configs = [ ":buffer_handle_public" ] @@ -31,4 +28,9 @@ ft_static_library("buffer_handle") { libs = [ "ipc_core", "hilog", "utils", "sec_shared" ] sources = [ "../src/buffer_handle.cpp" ] + deps = [ + "//build/gn/configs/system_libs:ipc_core", + "//build/gn/configs/system_libs:hilog", + "//build/gn/configs/system_libs:c_utils", + ] } diff --git a/display_server/utils/scoped_bytrace/ft_build/BUILD.gn b/display_server/utils/scoped_bytrace/ft_build/BUILD.gn index 82cf4eb..1cb4a4e 100644 --- a/display_server/utils/scoped_bytrace/ft_build/BUILD.gn +++ b/display_server/utils/scoped_bytrace/ft_build/BUILD.gn @@ -20,11 +20,6 @@ config("scoped_bytrace_config") { "-Werror", "-g3", ] - include_dirs = [ - "${sys_inc}/hitrace_meter", - "${sys_inc}/hilog", - ] - libs = ["hilog", "hitrace_meter"] } config("scoped_bytrace_public_config") { @@ -35,4 +30,8 @@ ft_static_library("scoped_bytrace") { sources = [ "../src/scoped_bytrace.cpp" ] configs = [ ":scoped_bytrace_config" ] public_configs = [ ":scoped_bytrace_public_config" ] + deps = [ + "//build/gn/configs/system_libs:hitrace_meter", + "//build/gn/configs/system_libs:hilog", + ] } -- Gitee