From 9141fb5c13cf77c25fe647a2bc63952ccdd5d51f Mon Sep 17 00:00:00 2001 From: xwx1135370 Date: Mon, 25 Aug 2025 15:48:17 +0800 Subject: [PATCH 1/2] remove musl deps faultloggerd Signed-off-by: xwx1135370 --- bundle.json | 1 - 1 file changed, 1 deletion(-) diff --git a/bundle.json b/bundle.json index 550377790..f940ed2ba 100644 --- a/bundle.json +++ b/bundle.json @@ -46,7 +46,6 @@ "init", "bounds_checking_function", "FreeBSD", - "faultloggerd", "cJSON", "optimized_routines" ], -- Gitee From 5c8435bb9cadf55ff254e6182cecd37772b31d07 Mon Sep 17 00:00:00 2001 From: xwx1135370 Date: Mon, 1 Sep 2025 09:16:59 +0800 Subject: [PATCH 2/2] [OpenHarmony-6.0-Release]fix llvm build error issue:https://gitee.com/openharmony/third_party_musl/issues/ICULFF?from=project-issue Signed-off-by: xwx1135370 --- libc-test/src/functionalext/adlt/BUILD.gn | 43 +++++++++++++---------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/libc-test/src/functionalext/adlt/BUILD.gn b/libc-test/src/functionalext/adlt/BUILD.gn index 4e57de6cb..1c6966215 100644 --- a/libc-test/src/functionalext/adlt/BUILD.gn +++ b/libc-test/src/functionalext/adlt/BUILD.gn @@ -13,7 +13,10 @@ import("//build/test.gni") import("../../../test_template.gni") import("test_src_functionalext_adlt.gni") + +if (defined(musl_use_adlt) && musl_use_adlt == true) { import("adlt_common.gni") +} foreach(s, functionalext_adlt_test) { test_unittest(s) { @@ -21,13 +24,6 @@ foreach(s, functionalext_adlt_test) { } } -action("adlt_build_syms") { - testonly = true - script = "//third_party/musl/libc-test/src/functionalext/adlt/adlt_tools.py" - args = [ "build_sym_script", "--lib-dir", rebase_path(adlt_lib_dir, ""), "--target-lib-dir", adlt_target_lib_dir ] - outputs = [ "$adlt_lib_dir/adlt_build_syms.sh" ] -} - group("functionalext_adlt_test") { testonly = true deps = [] @@ -39,17 +35,26 @@ group("functionalext_adlt_test") { } } -ohos_static_library("adlt_common") { - testonly = true - subsystem_name = "thirdparty" - part_name = "musl" +if (defined(musl_use_adlt) && musl_use_adlt == true) { + action("adlt_build_syms") { + testonly = true + script = "//third_party/musl/libc-test/src/functionalext/adlt/adlt_tools.py" + args = [ "build_sym_script", "--lib-dir", rebase_path(adlt_lib_dir, ""), "--target-lib-dir", adlt_target_lib_dir ] + outputs = [ "$adlt_lib_dir/adlt_build_syms.sh" ] + } - include_dirs = [ - "//third_party/musl/libc-test/src/functionalext/common", - "//third_party/musl/porting/linux/user/include", - "//third_party/musl/libc-test/src/common", - "common" - ] - configs = [ "//third_party/musl/libc-test/src/common:config_runtest" ] - sources = [ "common/adlt_common.cpp" ] + ohos_static_library("adlt_common") { + testonly = true + subsystem_name = "thirdparty" + part_name = "musl" + + include_dirs = [ + "//third_party/musl/libc-test/src/functionalext/common", + "//third_party/musl/porting/linux/user/include", + "//third_party/musl/libc-test/src/common", + "common" + ] + configs = [ "//third_party/musl/libc-test/src/common:config_runtest" ] + sources = [ "common/adlt_common.cpp" ] + } } \ No newline at end of file -- Gitee