diff --git a/third_party/musl/ndk_script/BUILD.gn b/third_party/musl/ndk_script/BUILD.gn index 012ac26b6643c05ac29bd8b339f8cbe29481b243..b25c9290ea055ae7a223d6e1a725a9e111a8a2c2 100644 --- a/third_party/musl/ndk_script/BUILD.gn +++ b/third_party/musl/ndk_script/BUILD.gn @@ -64,7 +64,7 @@ if (host_os == "mac") { } else { linux_x86_64_toolchains_dir = "${toolchains_dir}/linux-x86_64" windows_x86_64_toolchain_dir = "${toolchains_dir}/windows-x86_64" - ohos_arm64_toolchain_dir = "${toolchains_dir}/ohos-arm64" + # ohos_arm64_toolchain_dir = "${toolchains_dir}/ohos-arm64" ohos_ndk_toolchains("linux_x86_64") { dest_dir = "$ndk_linux_toolchains_out_dir" @@ -96,17 +96,17 @@ if (host_os == "mac") { license_file = "${windows_x86_64_toolchain_dir}/llvm/NOTICE" } - ohos_ndk_toolchains("ohos_arm64") { - dest_dir = "$ndk_ohos_toolchains_out_dir" - sources = [ - "${ohos_arm64_toolchain_dir}/llvm/bin", - "${ohos_arm64_toolchain_dir}/llvm/include", - "${ohos_arm64_toolchain_dir}/llvm/lib", - "${ohos_arm64_toolchain_dir}/llvm/libexec", - "${ohos_arm64_toolchain_dir}/llvm/python3", - "${ohos_arm64_toolchain_dir}/llvm/share", - ] - } + # ohos_ndk_toolchains("ohos_arm64") { + # dest_dir = "$ndk_ohos_toolchains_out_dir" + # sources = [ + # "${ohos_arm64_toolchain_dir}/llvm/bin", + # "${ohos_arm64_toolchain_dir}/llvm/include", + # "${ohos_arm64_toolchain_dir}/llvm/lib", + # "${ohos_arm64_toolchain_dir}/llvm/libexec", + # "${ohos_arm64_toolchain_dir}/llvm/python3", + # "${ohos_arm64_toolchain_dir}/llvm/share", + # ] + # } action("linux_toolchain") { outputs = [ "${ndk_linux_toolchains_out_dir}" ] @@ -130,15 +130,15 @@ if (host_os == "mac") { deps = [ ":windows_x86_64" ] } - action("ohos_toolchain") { - outputs = [ "${ndk_ohos_toolchains_out_dir}" ] - script = "toolchain.sh" - args = [ "-i" ] + [ rebase_path("${ohos_arm64_toolchain_dir}/libcxx-ndk") ] - args += [ "-o" ] + [ rebase_path("${ndk_ohos_toolchains_out_dir}") ] - args += - [ "-l" ] + [ rebase_path("${linux_x86_64_toolchains_dir}/llvm/bin") ] - deps = [ ":ohos_arm64" ] - } + # action("ohos_toolchain") { + # outputs = [ "${ndk_ohos_toolchains_out_dir}" ] + # script = "toolchain.sh" + # args = [ "-i" ] + [ rebase_path("${ohos_arm64_toolchain_dir}/libcxx-ndk") ] + # args += [ "-o" ] + [ rebase_path("${ndk_ohos_toolchains_out_dir}") ] + # args += + # [ "-l" ] + [ rebase_path("${linux_x86_64_toolchains_dir}/llvm/bin") ] + # deps = [ ":ohos_arm64" ] + # } } group("ndk_toolchain") { @@ -147,7 +147,7 @@ group("ndk_toolchain") { } else { deps = [ ":linux_toolchain", - ":ohos_toolchain", + # ":ohos_toolchain", ":windows_toolchain", ] }