diff --git a/BUILD.gn b/BUILD.gn index 4291a39..8b81a5a 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -14,7 +14,7 @@ # import("//build/ohos.gni") -import("freebsd.gni") +import("FreeBSD.gni") config("free_bsd_config") { include_dirs = [ "//third_party/FreeBSD" ] diff --git a/FreeBSD.gni b/FreeBSD.gni index 51bb689..540b3e0 100644 --- a/FreeBSD.gni +++ b/FreeBSD.gni @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2022 Huawei Device Co., Ltd. All rights reserved. +# Copyright (c) 2022-2024 Huawei Device Co., Ltd. All rights reserved. # # Redistribution and use in source and binary forms, with or without modification, # are permitted provided that the following conditions are met: @@ -28,3 +28,22 @@ FREEBSD_SYS_LIBKERN_SRC_FILES = [ "//third_party/FreeBSD/sys/libkern/crc32.c" ] FREEBSD_DIR = get_path_info(".", "abspath") + +build_inherited_configs = [ + "//build/config/compiler:afdo", + "//build/config/compiler:afdo_optimize_size", + "//build/config/compiler:compiler", + "//build/config/compiler:compiler_arm_fpu", + "//build/config/compiler:compiler_arm_thumb", + "//build/config/compiler:chromium_code", + "//build/config/compiler:default_include_dirs", + "//build/config/compiler:default_optimization", + "//build/config/compiler:default_stack_frames", + "//build/config/compiler:default_symbols", + "//build/config/compiler:export_dynamic", + "//build/config/compiler:no_exceptions", + "//build/config/compiler:no_rtti", + "//build/config/compiler:runtime_library", + "//build/config/compiler:thin_archive", + "//build/config/sanitizers:default_sanitizer_flags", +] diff --git a/freebsd.gni b/freebsd.gni deleted file mode 100644 index 3742521..0000000 --- a/freebsd.gni +++ /dev/null @@ -1,33 +0,0 @@ -# -# Copyright (c) 2024 Huawei Device 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. -# - -build_inherited_configs = [ - "//build/config/compiler:afdo", - "//build/config/compiler:afdo_optimize_size", - "//build/config/compiler:compiler", - "//build/config/compiler:compiler_arm_fpu", - "//build/config/compiler:compiler_arm_thumb", - "//build/config/compiler:chromium_code", - "//build/config/compiler:default_include_dirs", - "//build/config/compiler:default_optimization", - "//build/config/compiler:default_stack_frames", - "//build/config/compiler:default_symbols", - "//build/config/compiler:export_dynamic", - "//build/config/compiler:no_exceptions", - "//build/config/compiler:no_rtti", - "//build/config/compiler:runtime_library", - "//build/config/compiler:thin_archive", - "//build/config/sanitizers:default_sanitizer_flags", -]