diff --git a/third_party/musl/ndk_script/BUILD.gn b/third_party/musl/ndk_script/BUILD.gn index ad7a2add83d3d605096e01f71191cb448f8b97d5..ad9e795af0b47bd4891e36cd97459a4f73b9f05c 100644 --- a/third_party/musl/ndk_script/BUILD.gn +++ b/third_party/musl/ndk_script/BUILD.gn @@ -10,7 +10,7 @@ # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and -# limitations under the License. +# limitations under the License. import("//build/config/clang/clang.gni") import("//build/ohos/ndk/ndk.gni") @@ -64,7 +64,6 @@ 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_ndk_toolchains("linux_x86_64") { dest_dir = "$ndk_linux_toolchains_out_dir" @@ -95,19 +94,6 @@ if (host_os == "mac") { args = [ "--follow-all-symlinks" ] 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", - ] - } - action("linux_toolchain") { outputs = [ "${ndk_linux_toolchains_out_dir}" ] script = "toolchain.sh" @@ -131,22 +117,12 @@ if (host_os == "mac") { } } -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") { if (host_os == "mac") { deps = [ ":darwin_toolchain" ] } else { deps = [ ":linux_toolchain", - ":ohos_toolchain", ":windows_toolchain", ] } @@ -267,7 +243,7 @@ ohos_copy("musl_arm_bits_arm32") { sources_temp += musl_inc_bits_files sources_orig = get_path_info(sources_temp, "file") - # print("${sources_orig}") + # print("${sources_orig}") foreach(s, sources_orig) { sources += [ get_label_info(deps[0], "target_out_dir") + @@ -287,7 +263,7 @@ ohos_copy("musl_bits_aarch64") { sources_temp += musl_inc_bits_files sources_orig = get_path_info(sources_temp, "file") - # print("${sources_orig}") + # print("${sources_orig}") foreach(s, sources_orig) { sources += [ get_label_info(deps[0], "target_out_dir") + @@ -307,7 +283,7 @@ ohos_copy("musl_bits_x86_64") { sources_temp += musl_inc_bits_files sources_orig = get_path_info(sources_temp, "file") - # print("${sources_orig}") + # print("${sources_orig}") foreach(s, sources_orig) { sources += [ get_label_info(deps[0], "target_out_dir") +