未验证 提交 cf178463 编写于 作者: O openharmony_ci 提交者: Gitee

!785 NDK中native包增加x86_64架构

Merge pull request !785 from lijunru/cherry-pick-1673599465
......@@ -198,6 +198,19 @@ musl_lib_arm64 = [
"//third_party/musl:soft_librt(//build/toolchain/ohos:ohos_clang_arm64)",
]
musl_lib_x86_64 = [
"//third_party/musl:soft_musl_crt_install_action(//build/toolchain/ohos:ohos_clang_x86_64)",
"//third_party/musl:soft_libc_musl_static(//build/toolchain/ohos:ohos_clang_x86_64)",
"//third_party/musl:soft_libm(//build/toolchain/ohos:ohos_clang_x86_64)",
"//third_party/musl:soft_libdl(//build/toolchain/ohos:ohos_clang_x86_64)",
"//third_party/musl:soft_libpthread(//build/toolchain/ohos:ohos_clang_x86_64)",
"//third_party/musl:soft_libcrypt(//build/toolchain/ohos:ohos_clang_x86_64)",
"//third_party/musl:soft_libutil(//build/toolchain/ohos:ohos_clang_x86_64)",
"//third_party/musl:soft_libxnet(//build/toolchain/ohos:ohos_clang_x86_64)",
"//third_party/musl:soft_libresolv(//build/toolchain/ohos:ohos_clang_x86_64)",
"//third_party/musl:soft_librt(//build/toolchain/ohos:ohos_clang_x86_64)",
]
## arm-linux-ohos asm directory
ohos_ndk_copy("musl_arm_uapi_arm32") {
dest_dir = "$ndk_os_irrelevant_out_dir/sysroot/usr/include/arm-linux-ohos"
......@@ -332,3 +345,35 @@ ohos_copy("musl_ndk_libs_aarch64") {
outputs = [ "$ndk_os_irrelevant_out_dir/sysroot/usr/lib/aarch64-linux-ohos/{{source_file_part}}" ]
}
ohos_copy("musl_ndk_libs_x86_64") {
deps = musl_lib_x86_64
crt_dir = "${root_build_dir}/obj/third_party/musl/usr/lib/x86_64-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/x86_64-linux-ohos/libc.a" ]
sources += [ get_label_info(deps[0], "target_out_dir") +
"/usr/lib/x86_64-linux-ohos/libdl.a" ]
sources += [ get_label_info(deps[0], "target_out_dir") +
"/usr/lib/x86_64-linux-ohos/libm.a" ]
sources += [ get_label_info(deps[0], "target_out_dir") +
"/usr/lib/x86_64-linux-ohos/libcrypt.a" ]
sources += [ get_label_info(deps[0], "target_out_dir") +
"/usr/lib/x86_64-linux-ohos/libpthread.a" ]
sources += [ get_label_info(deps[0], "target_out_dir") +
"/usr/lib/x86_64-linux-ohos/libresolv.a" ]
sources += [ get_label_info(deps[0], "target_out_dir") +
"/usr/lib/x86_64-linux-ohos/librt.a" ]
sources += [ get_label_info(deps[0], "target_out_dir") +
"/usr/lib/x86_64-linux-ohos/libutil.a" ]
sources += [ get_label_info(deps[0], "target_out_dir") +
"/usr/lib/x86_64-linux-ohos/libxnet.a" ]
outputs = [ "$ndk_os_irrelevant_out_dir/sysroot/usr/lib/x86_64-linux-ohos/{{source_file_part}}" ]
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册