From 1d5f9eacbf14e54fef14cb1789ef6c277a9e0f38 Mon Sep 17 00:00:00 2001 From: yanansong Date: Mon, 19 Jun 2023 11:02:11 +0800 Subject: [PATCH 1/3] enable libfence --- build/gn/BUILD.gn | 1 + .../frameworks/fence/ft_build/BUILD.gn | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100755 display_server/frameworks/fence/ft_build/BUILD.gn diff --git a/build/gn/BUILD.gn b/build/gn/BUILD.gn index cc6bf28..6bf547c 100644 --- a/build/gn/BUILD.gn +++ b/build/gn/BUILD.gn @@ -15,5 +15,6 @@ group("ft_engine") { deps = [ "//display_server/utils/socketpair/ft_build:socketpair", "//display_server/rosen/modules/composer/vsync/ft_build:libvsync", + "//display_server/frameworks/fence/ft_build:libfence" ] } diff --git a/display_server/frameworks/fence/ft_build/BUILD.gn b/display_server/frameworks/fence/ft_build/BUILD.gn new file mode 100755 index 0000000..e802b5b --- /dev/null +++ b/display_server/frameworks/fence/ft_build/BUILD.gn @@ -0,0 +1,33 @@ +# 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") + +config("fence_config") { + visibility = [ ":*" ] + include_dirs = [ "../include" ] + include_dirs += [ "${sys_inc}/c_utils", "${sys_inc}/hilog" ] + + cflags = [ + "-Wall", + "-Werror", + "-g3", + ] + + libs = ["utils", "hilog", "sec_shared"] +} + +ft_shared_library("libfence") { + sources = [ "../src/fence.cpp" ] + configs = [ ":fence_config" ] +} \ No newline at end of file -- Gitee From 56a7a6937bf3ec2ead66c3017248333426318b32 Mon Sep 17 00:00:00 2001 From: yanansong Date: Mon, 19 Jun 2023 17:08:51 +0800 Subject: [PATCH 2/3] remove libfence from BUILD.gn --- build/gn/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/build/gn/BUILD.gn b/build/gn/BUILD.gn index 6bf547c..cc6bf28 100644 --- a/build/gn/BUILD.gn +++ b/build/gn/BUILD.gn @@ -15,6 +15,5 @@ group("ft_engine") { deps = [ "//display_server/utils/socketpair/ft_build:socketpair", "//display_server/rosen/modules/composer/vsync/ft_build:libvsync", - "//display_server/frameworks/fence/ft_build:libfence" ] } -- Gitee From dbc12082ac97e70a1430124436aee84777e787aa Mon Sep 17 00:00:00 2001 From: yanansong Date: Mon, 19 Jun 2023 19:27:12 +0800 Subject: [PATCH 3/3] use config to load syslibs and inc --- display_server/frameworks/fence/ft_build/BUILD.gn | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/display_server/frameworks/fence/ft_build/BUILD.gn b/display_server/frameworks/fence/ft_build/BUILD.gn index e802b5b..5dde757 100755 --- a/display_server/frameworks/fence/ft_build/BUILD.gn +++ b/display_server/frameworks/fence/ft_build/BUILD.gn @@ -16,18 +16,18 @@ import("//build/gn/fangtian.gni") config("fence_config") { visibility = [ ":*" ] include_dirs = [ "../include" ] - include_dirs += [ "${sys_inc}/c_utils", "${sys_inc}/hilog" ] - cflags = [ "-Wall", "-Werror", "-g3", ] - - libs = ["utils", "hilog", "sec_shared"] } ft_shared_library("libfence") { sources = [ "../src/fence.cpp" ] - configs = [ ":fence_config" ] + configs = [ + ":fence_config", + "//build/gn/configs/system_libs:hilog_config", + "//build/gn/configs/system_libs:c_utils_config" + ] } \ No newline at end of file -- Gitee