Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Reverts "Refactors RBE support" #49654

Merged
merged 1 commit into from
Jan 9, 2024
Merged

Reverts "Refactors RBE support" #49654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,4 @@ app.*.symbols

# Prebuilt binaries.
/prebuilts/

# GN build support for protobufs vended by Fuchsia.
/build/secondary/third_party/protobuf

# RBE support configurations and scripts vended from CIPD
/build/rbe
60 changes: 6 additions & 54 deletions DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ vars = {
# https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/goma/client
'goma_version': ' git_revision:41b3bcb64014144a844153fd5588c36411fffb56',

'reclient_version': 'git_revision:f3883c2237b0eb9cc9524cb571b5ab8378f257e4',
'reclient_version': 'git_revision:81e819b39d4743462857cc55430d898b9fcca1af',

'gcloud_version': 'version:2@444.0.0.chromium.3',

Expand Down Expand Up @@ -127,10 +127,6 @@ vars = {
# specified by GOMA_DIR, or installed in the default goma install location.
'use_cipd_goma': False,

# When this is true, the Flutter Engine's configuration files and scripts for
# RBE will be downloaded from CIPD. This option is only usable by Googlers.
'use_rbe': False,

# This is not downloaded be default because it increases the
# `gclient sync` time by between 1 and 3 minutes. This option is enabled
# in flutter/ci/builders/mac_impeller_cmake_example.json, and is likely to
Expand Down Expand Up @@ -271,7 +267,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'a43582b52d361bc3da156a8e6eab6dd947ca339d',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '8c274b21f1ad4f2aec0a5e0ae8f4264393045b4b',

'src/flutter/third_party/rapidjson':
Var('flutter_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b',
Expand Down Expand Up @@ -848,7 +844,7 @@ deps = {
'version': Var('clang_version'),
}
],
'condition': 'host_os == "linux" or host_os == "mac"',
'condition': 'host_os == "linux" and host_cpu == "x64"',
'dep_type': 'cipd',
},

Expand Down Expand Up @@ -908,48 +904,15 @@ deps = {
'dep_type': 'cipd',
},

# RBE binaries and configs.
# reclient.
'src/buildtools/linux-x64/reclient': {
'packages': [
{
'package': 'infra/rbe/client/${{platform}}',
'version': Var('reclient_version'),
}
],
'condition': 'use_rbe and host_os == "linux" and host_cpu == "x64"',
'dep_type': 'cipd',
},

'src/buildtools/mac-arm64/reclient': {
'packages': [
{
'package': 'infra/rbe/client/${{platform}}',
'version': Var('reclient_version'),
}
],
'condition': 'use_rbe and host_os == "mac" and host_cpu == "arm64"',
'dep_type': 'cipd',
},

'src/buildtools/mac-x64/reclient': {
'packages': [
{
'package': 'infra/rbe/client/${{platform}}',
'version': Var('reclient_version'),
}
],
'condition': 'use_rbe and host_os == "mac" and host_cpu == "x64"',
'dep_type': 'cipd',
},

'src/flutter/build/rbe': {
'packages': [
{
'package': 'flutter_internal/rbe/reclient_cfgs',
'version': 'U42C0v8jI-_YREjd8rbDEt0evvqvLWJ_NTkaiJ_Clt8C',
}
],
'condition': 'use_rbe',
'condition': 'host_os == "linux" and host_cpu == "x64"',
'dep_type': 'cipd',
},

Expand All @@ -961,18 +924,7 @@ deps = {
'version': Var('gcloud_version'),
}
],
'condition': 'use_rbe and host_os == "linux" and host_cpu == "x64"',
'dep_type': 'cipd',
},

'src/buildtools/mac-arm64/gcloud': {
'packages': [
{
'package': 'infra/3pp/tools/gcloud/${{platform}}',
'version': Var('gcloud_version'),
}
],
'condition': 'use_rbe and host_os == "mac" and host_cpu == "arm64"',
'condition': 'host_os == "linux" and host_cpu == "x64"',
'dep_type': 'cipd',
},

Expand Down
6 changes: 0 additions & 6 deletions ci/builders/linux_android_emulator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
"kvm=1",
"cores=8"
],
"gclient_variables": {
"use_rbe": true
},
"gn": [
"--android",
"--android-cpu=x64",
Expand Down Expand Up @@ -72,9 +69,6 @@
"kvm=1",
"cores=8"
],
"gclient_variables": {
"use_rbe": true
},
"gn": [
"--android",
"--android-cpu=x86",
Expand Down
9 changes: 0 additions & 9 deletions ci/builders/linux_unopt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
"os=Linux",
"cores=32"
],
"gclient_variables": {
"use_rbe": true
},
"gn": [
"--runtime-mode",
"debug",
Expand Down Expand Up @@ -87,9 +84,6 @@
"os=Linux"
],
"dependencies": [],
"gclient_variables": {
"use_rbe": true
},
"gn": [
"--android",
"--embedder-for-target",
Expand Down Expand Up @@ -118,9 +112,6 @@
"version": "last_updated:2023-02-03T15:32:01-0800"
}
],
"gclient_variables": {
"use_rbe": true
},
"gn": [
"--android",
"--unoptimized",
Expand Down
40 changes: 10 additions & 30 deletions ci/builders/mac_unopt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,15 @@
"mac_model=Macmini8,1"
],
"gclient_variables": {
"download_android_deps": false,
"use_rbe": true
"download_android_deps": false
},
"gn": [
"--runtime-mode",
"debug",
"--unoptimized",
"--no-lto",
"--prebuilt-dart-sdk",
"--enable-impeller-3d",
"--rbe",
"--no-goma",
"--xcode-symlinks"
"--enable-impeller-3d"
],
"name": "host_debug_unopt",
"ninja": {
Expand Down Expand Up @@ -79,18 +75,14 @@
"cpu=x86"
],
"gclient_variables": {
"download_android_deps": false,
"use_rbe": true
"download_android_deps": false
},
"gn": [
"--ios",
"--runtime-mode",
"debug",
"--simulator",
"--no-lto",
"--rbe",
"--no-goma",
"--xcode-symlinks"
"--no-lto"
],
"name": "ios_debug_sim",
"ninja": {
Expand Down Expand Up @@ -140,8 +132,7 @@
"cpu=arm64"
],
"gclient_variables": {
"download_android_deps": false,
"use_rbe": true
"download_android_deps": false
},
"gn": [
"--runtime-mode",
Expand All @@ -151,10 +142,7 @@
"--prebuilt-dart-sdk",
"--force-mac-arm64",
"--mac-cpu",
"arm64",
"--rbe",
"--no-goma",
"--xcode-symlinks"
"arm64"
],
"name": "host_debug_unopt_arm64",
"ninja": {
Expand Down Expand Up @@ -193,8 +181,7 @@
"cpu=arm64"
],
"gclient_variables": {
"download_android_deps": false,
"use_rbe": true
"download_android_deps": false
},
"gn": [
"--ios",
Expand All @@ -204,10 +191,7 @@
"--no-lto",
"--force-mac-arm64",
"--simulator-cpu",
"arm64",
"--rbe",
"--no-goma",
"--xcode-symlinks"
"arm64"
],
"name": "ios_debug_sim_arm64",
"ninja": {
Expand Down Expand Up @@ -267,8 +251,7 @@
"cpu=arm64"
],
"gclient_variables": {
"download_android_deps": false,
"use_rbe": true
"download_android_deps": false
},
"gn": [
"--ios",
Expand All @@ -279,10 +262,7 @@
"--force-mac-arm64",
"--simulator-cpu",
"arm64",
"--darwin-extension-safe",
"--rbe",
"--no-goma",
"--xcode-symlinks"
"--darwin-extension-safe"
],
"name": "ios_debug_sim_arm64_extension_safe",
"ninja": {
Expand Down
3 changes: 1 addition & 2 deletions ci/builders/standalone/linux_benchmarks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
"os=Linux"
],
"gclient_variables": {
"download_android_deps": false,
"use_rbe": true
"download_android_deps": false
},
"gn": [
"--runtime-mode",
Expand Down
37 changes: 8 additions & 29 deletions tools/gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,8 @@ def buildtools_dir():
host_cpu = get_host_cpu()
if host_os == 'win':
host_os = 'windows'
if host_os == 'mac' and host_cpu == 'arm64':
host_cpu = 'x64'
return '%s-%s' % (host_os, host_cpu)


Expand All @@ -215,10 +217,9 @@ def setup_rbe(args):
if not args.rbe:
return rbe_gn_args

if get_host_os() not in ['linux', 'mac']:
if get_host_os() not in ['linux']:
print(
'The --rbe flag has no effect. RBE is currently only supported on '
'macOS and Linux.'
'The --rbe flag has no effect. RBE is currently only supported on Linux.'
)
return rbe_gn_args

Expand All @@ -238,9 +239,7 @@ def setup_rbe(args):
)
bootstrap_path = os.path.join(cipd_reclient_dir, 'bootstrap')
reproxy_path = os.path.join(cipd_reclient_dir, 'reproxy')
rbe_cfg_path = os.path.join(
SRC_ROOT, 'flutter', 'build', 'rbe', 'reclient.cfg'
)
rbe_cfg_path = os.path.join(SRC_ROOT, 'build', 'rbe.cfg')
bootstrap_cmd = [
bootstrap_path,
'--re_proxy=' + reproxy_path,
Expand All @@ -261,20 +260,8 @@ def setup_rbe(args):
rbe_gn_args['rbe_dial_timeout'] = args.rbe_dial_timeout
if args.rbe_platform:
rbe_gn_args['rbe_platform'] = args.rbe_platform

rbe_gn_args['rbe_dir'] = os.path.join(
SRC_ROOT, 'buildtools', buildtools_dir(), 'reclient'
)

rbe_gn_args['rbe_cfg'] = os.path.join(
SRC_ROOT, 'flutter', 'build', 'rbe',
'rewrapper-' + buildtools_dir() + '.cfg'
)

if sys.platform == 'darwin':
if (not running_on_luci or args.xcode_symlinks or
os.getenv('FLUTTER_GOMA_CREATE_XCODE_SYMLINKS', '0') == '1'):
rbe_gn_args['create_xcode_symlinks'] = True
if args.rbe_dir:
rbe_gn_args['rbe_dir'] = args.rbe_dir

return rbe_gn_args

Expand All @@ -298,16 +285,8 @@ def setup_goma(args):
# care of starting and stopping the compiler proxy.
running_on_luci = os.environ.get('LUCI_CONTEXT') is not None

# The GOMA client has no arm64 binary, so run the x64 binary through
# Rosetta.
buildtools_platform = buildtools_dir()
if buildtools_platform == 'mac-arm64':
buildtools_platform = 'mac-x64'

# Prefer the goma fetched by gclient if it exists.
cipd_goma_dir = os.path.join(
SRC_ROOT, 'buildtools', buildtools_platform, 'goma'
)
cipd_goma_dir = os.path.join(SRC_ROOT, 'buildtools', buildtools_dir(), 'goma')

# Next, if GOMA_DIR is set, use that install.
goma_dir = os.environ.get('GOMA_DIR')
Expand Down