From b9a45cd07a1ff6f5e027f521565a7faeef73dc77 Mon Sep 17 00:00:00 2001 From: wylyw78 Date: Wed, 12 Jun 2024 20:03:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8DLinux=20arm=20host=20openharm?= =?UTF-8?q?ony=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wylyw78 --- protos/protos.gni | 8 ++++---- protos/services/BUILD.gn | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/protos/protos.gni b/protos/protos.gni index d60797fcb..79c14dc66 100644 --- a/protos/protos.gni +++ b/protos/protos.gni @@ -15,18 +15,18 @@ import("../build/config.gni") subsys_name = OHOS_PROFILER_SUBSYS_NAME part_name = OHOS_PROFILER_PART_NAME -subsys_x64_out = "clang_x64/thirdparty/grpc" -proto_gen_ipc_dir = "clang_x64/$subsys_name/$part_name" +subsys_x64_out = "clang_${host_cpu}/thirdparty/grpc" +proto_gen_ipc_dir = "clang_${host_cpu}/$subsys_name/$part_name" libc_dir_proto = rebase_path("$asdk_libs_dir", "//") root_output_dir_proto = rebase_path("$root_out_dir", "//") #host:clang_x64 default:arm mingw:mingw_x86_64 if (current_toolchain != host_toolchain) { if (current_toolchain == default_toolchain) { - root_output_dir_proto = "$root_output_dir_proto/clang_x64" + root_output_dir_proto = "$root_output_dir_proto/clang_${host_cpu}" } else { root_output_dir_proto = - get_path_info("$root_output_dir_proto", "dir") + "/clang_x64" + get_path_info("$root_output_dir_proto", "dir") + "/clang_${host_cpu}" } } protoc = root_output_dir_proto diff --git a/protos/services/BUILD.gn b/protos/services/BUILD.gn index f24b41ca8..4e74b4cd7 100644 --- a/protos/services/BUILD.gn +++ b/protos/services/BUILD.gn @@ -148,8 +148,8 @@ action("profiler_service_interface_gen") { args += rebase_path(sources, root_build_dir) deps = [ ":all_type_gen", - "${OHOS_PROFILER_3RDPARTY_GRPC_DIR}:grpc_cpp_plugin(//build/toolchain/linux:clang_x64)", - "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(//build/toolchain/linux:clang_x64)", + "${OHOS_PROFILER_3RDPARTY_GRPC_DIR}:grpc_cpp_plugin(//build/toolchain/linux:clang_${host_cpu})", + "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(//build/toolchain/linux:clang_${host_cpu})", ] }