60 lines
2.1 KiB
Diff
60 lines
2.1 KiB
Diff
From c14e20a9afa283e454b3e5c209e237c100fbf10d Mon Sep 17 00:00:00 2001
|
|
From: s_c_c <shichuchao@huawei.com>
|
|
Date: Wed, 13 Mar 2024 16:12:51 +0800
|
|
Subject: [PATCH] feat for embedded fix sysroot path
|
|
|
|
---
|
|
.../hiviewdfx/hilog/interfaces/native/innerkits/BUILD.gn | 7 ++++---
|
|
.../third_party/bounds_checking_function/BUILD.gn | 3 ++-
|
|
2 files changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/innerkits/BUILD.gn b/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/innerkits/BUILD.gn
|
|
index bd1f91b..776e60a 100644
|
|
--- a/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/innerkits/BUILD.gn
|
|
+++ b/openeuler/compiler_gn/base/hiviewdfx/hilog/interfaces/native/innerkits/BUILD.gn
|
|
@@ -11,9 +11,10 @@
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
import("//build/ohos.gni")
|
|
+import("//build/config/sysroot.gni")
|
|
|
|
config("libhilog_pub_config") {
|
|
- include_dirs = [ "include" ]
|
|
+ include_dirs = [ "${sysroot}/usr/include/hilog" ]
|
|
libs = ["hilog.z"]
|
|
}
|
|
|
|
@@ -22,11 +23,11 @@ group("libhilog") {
|
|
}
|
|
|
|
config("libhilog_base_pub_cfg") {
|
|
- include_dirs = [ "include" ]
|
|
+ include_dirs = [ "${sysroot}/usr/include/hilog" ]
|
|
}
|
|
|
|
ohos_prebuilt_static_library("libhilog_base") {
|
|
- source = "/usr/lib64/libhilog_base.a"
|
|
+ source = "${sysroot}/usr/lib64/libhilog_base.a"
|
|
public_configs = [ ":libhilog_base_pub_cfg" ]
|
|
|
|
part_name = "hilog_native"
|
|
diff --git a/openeuler/compiler_gn/third_party/bounds_checking_function/BUILD.gn b/openeuler/compiler_gn/third_party/bounds_checking_function/BUILD.gn
|
|
index ae44b79..5c17fb7 100644
|
|
--- a/openeuler/compiler_gn/third_party/bounds_checking_function/BUILD.gn
|
|
+++ b/openeuler/compiler_gn/third_party/bounds_checking_function/BUILD.gn
|
|
@@ -11,9 +11,10 @@
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
import("//build/ohos.gni")
|
|
+import("//build/config/sysroot.gni")
|
|
|
|
config("libsec_public_config") {
|
|
- include_dirs = [ "include" ]
|
|
+ include_dirs = [ "${sysroot}/usr/include" ]
|
|
libs = [ "boundscheck" ]
|
|
}
|
|
|
|
--
|
|
2.20.1 (Apple Git-117)
|
|
|