diff --git a/musl_template.gni b/musl_template.gni index aa83568db74bc7c935b5eaf3082abceb68233d94..88cf29a113b299b19f6ec954e79c9ecd8dcf54c8 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 e53513b62c826497deeaa8bdd5d82da3c71eaf8c..1ba7ce822e8e91b8e70c1926ac37f60614a45b6c 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 2ecc8ef549f08500f7c9749768f9a38649fdee5c..2c2ed79a87d0b4d5027c10f84e3e902de6582742 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" },