From 0672d273f2ae4ac129c06e1bbfa80ce927216c22 Mon Sep 17 00:00:00 2001
From: hhj <huanghuijin@huawei.com>
Date: Thu, 9 Jun 2022 15:30:53 +0800
Subject: [PATCH] add ohos note section for all dso

Signed-off-by: hhj <huanghuijin@huawei.com>
---
 musl_template.gni                |  2 +-
 ndk_script/BUILD.gn              | 18 ++++++++----------
 ndk_script/adapter/libc.ndk.json |  2 --
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/musl_template.gni b/musl_template.gni
index aa83568d..88cf29a1 100644
--- a/musl_template.gni
+++ b/musl_template.gni
@@ -504,7 +504,7 @@ template("musl_libs") {
       "${redir}/${target_out_dir}/${musl_ported_dir}/crt/${musl_arch}/${abi_prefix}_musl_crt/crti.o",
       "${redir}/${target_out_dir}/${musl_ported_dir}/crt/${musl_arch}/${abi_prefix}_musl_crt/crtn.o",
     ]
-    outputs = [ "${target_out_dir}/${_libs_out_dir}/{{source_file_part}}" ]
+    outputs = [ "${root_build_dir}/obj/third_party/musl/${_libs_out_dir}/{{source_file_part}}" ]
     args = [
       "--input",
       "{{source}}",
diff --git a/ndk_script/BUILD.gn b/ndk_script/BUILD.gn
index e53513b6..1ba7ce82 100644
--- a/ndk_script/BUILD.gn
+++ b/ndk_script/BUILD.gn
@@ -183,16 +183,14 @@ ohos_copy("musl_arm_bits_arm32") {
 
 ohos_copy("musl_ndk_libs_arm32") {
   deps = musl_lib_arm32
-  sources = [ get_label_info(deps[0], "target_out_dir") +
-              "/usr/lib/arm-linux-ohos/Scrt1.o" ]
-  sources += [ get_label_info(deps[0], "target_out_dir") +
-               "/usr/lib/arm-linux-ohos/crt1.o" ]
-  sources += [ get_label_info(deps[0], "target_out_dir") +
-               "/usr/lib/arm-linux-ohos/crti.o" ]
-  sources += [ get_label_info(deps[0], "target_out_dir") +
-               "/usr/lib/arm-linux-ohos/crtn.o" ]
-  sources += [ get_label_info(deps[0], "target_out_dir") +
-               "/usr/lib/arm-linux-ohos/rcrt1.o" ]
+  crt_dir = "${root_build_dir}/obj/third_party/musl/usr/lib/arm-linux-ohos"
+  sources = [
+    "${crt_dir}/Scrt1.o",
+    "${crt_dir}/crt1.o",
+    "${crt_dir}/crti.o",
+    "${crt_dir}/crtn.o",
+    "${crt_dir}/rcrt1.o",
+  ]
   sources += [ get_label_info(deps[0], "target_out_dir") +
                "/usr/lib/arm-linux-ohos/libm.a" ]
   sources += [ get_label_info(deps[0], "target_out_dir") +
diff --git a/ndk_script/adapter/libc.ndk.json b/ndk_script/adapter/libc.ndk.json
index 2ecc8ef5..2c2ed79a 100644
--- a/ndk_script/adapter/libc.ndk.json
+++ b/ndk_script/adapter/libc.ndk.json
@@ -89,9 +89,7 @@
     { "name": "_dlstart" },
     { "name": "_exit" },
     { "name": "_Exit" },
-    { "name": "_fini" },
     { "name": "_flushlbf" },
-    { "name": "_init" },
     { "name": "_longjmp" },
     { "name": "_pthread_cleanup_pop" },
     { "name": "_pthread_cleanup_push" },
-- 
GitLab