diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni index 7cd849166dd..173a707ad37 100644 --- a/build/config/sysroot.gni +++ b/build/config/sysroot.gni @@ -49,7 +49,7 @@ if ((current_toolchain == host_toolchain || sysroot = target_sysroot } else if (is_android) { import("//build/config/android/config.gni") - sysroot = rebase_path("$android_toolchain_root/sysroot") + sysroot = rebase_path("$android_toolchain_root/sysroot", root_build_dir) } else if (is_mac) { import("//build/config/mac/mac_sdk.gni") sysroot = mac_sdk_path diff --git a/build/toolchain/android/BUILD.gn b/build/toolchain/android/BUILD.gn index a47a9f83238..c832a50d313 100644 --- a/build/toolchain/android/BUILD.gn +++ b/build/toolchain/android/BUILD.gn @@ -25,6 +25,20 @@ template("android_toolchain") { assembler_prefix = "$goma_dir/gomacc " compiler_prefix = "$goma_dir/gomacc " link_prefix = "$goma_dir/gomacc " + } else if (use_rbe) { + assert(!use_goma) + rewrapper_args = [ + "$rbe_dir/rewrapper", + "--exec_root=$rbe_exec_root", + "--platform=$rbe_platform", + ] + assembler_args = [] + compiler_args = + rewrapper_args + [ "--labels=type=compile,compiler=clang,lang=cpp " ] + link_args = [] # rewrapper_args + [ "--labels=type=link,tool=clang " ] + assembler_prefix = string_join(" ", assembler_args) + compiler_prefix = string_join(" ", compiler_args) + link_prefix = string_join(" ", link_args) } else if (use_ccache) { assembler_prefix = "ccache " compiler_prefix = "ccache "