Skip to content

Commit

Permalink
Restore goma from rbe before 3.16 branching (flutter#46272)
Browse files Browse the repository at this point in the history
This is a revert of targets that generate artifacts for framework:
```
Linux linux_fuchsia
Linux linux_android_aot_engine
Linux linux_android_debug_engine
Linux linux_arm_host_engine
Linux linux_host_desktop_engine
Linux linux_host_engine
```
  • Loading branch information
keyonghan authored Sep 25, 2023
1 parent 1505702 commit 6bf8067
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 87 deletions.
24 changes: 6 additions & 18 deletions ci/builders/linux_android_aot_engine.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@
"profile",
"--android",
"--android-cpu",
"arm",
"--rbe",
"--no-goma"
"arm"
],
"name": "android_profile",
"ninja": {
Expand Down Expand Up @@ -63,9 +61,7 @@
"release",
"--android",
"--android-cpu",
"arm",
"--rbe",
"--no-goma"
"arm"
],
"name": "android_release",
"ninja": {
Expand Down Expand Up @@ -103,9 +99,7 @@
"release",
"--android",
"--android-cpu",
"arm64",
"--rbe",
"--no-goma"
"arm64"
],
"name": "android_release_arm64",
"ninja": {
Expand Down Expand Up @@ -158,9 +152,7 @@
"--runtime-mode",
"profile",
"--android-cpu",
"arm64",
"--rbe",
"--no-goma"
"arm64"
],
"name": "android_profile_arm64",
"ninja": {
Expand Down Expand Up @@ -198,9 +190,7 @@
"profile",
"--android",
"--android-cpu",
"x64",
"--rbe",
"--no-goma"
"x64"
],
"name": "android_profile_x64",
"ninja": {
Expand Down Expand Up @@ -238,9 +228,7 @@
"release",
"--android",
"--android-cpu",
"x64",
"--rbe",
"--no-goma"
"x64"
],
"name": "android_release_x64",
"ninja": {
Expand Down
24 changes: 6 additions & 18 deletions ci/builders/linux_android_debug_engine.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
"gn": [
"--android",
"--android-cpu=x86",
"--runtime-mode=jit_release",
"--rbe",
"--no-goma"
"--runtime-mode=jit_release"
],
"name": "android_jit_release_x86",
"ninja": {
Expand Down Expand Up @@ -74,9 +72,7 @@
"gn": [
"--android",
"--android-cpu=arm",
"--no-lto",
"--rbe",
"--no-goma"
"--no-lto"
],
"name": "android_debug",
"ninja": {
Expand Down Expand Up @@ -127,9 +123,7 @@
"gn": [
"--android",
"--android-cpu=arm64",
"--no-lto",
"--rbe",
"--no-goma"
"--no-lto"
],
"name": "android_debug_arm64",
"ninja": {
Expand All @@ -150,9 +144,7 @@
"--android",
"--android-cpu=arm64",
"--no-lto",
"--enable-vulkan-validation-layers",
"--rbe",
"--no-goma"
"--enable-vulkan-validation-layers"
],
"name": "android_debug_arm64_validation_layers",
"ninja": {
Expand Down Expand Up @@ -184,9 +176,7 @@
"gn": [
"--android",
"--android-cpu=x86",
"--no-lto",
"--rbe",
"--no-goma"
"--no-lto"
],
"name": "android_debug_x86",
"ninja": {
Expand Down Expand Up @@ -218,9 +208,7 @@
"gn": [
"--android",
"--android-cpu=x64",
"--no-lto",
"--rbe",
"--no-goma"
"--no-lto"
],
"name": "android_debug_x64",
"ninja": {
Expand Down
12 changes: 3 additions & 9 deletions ci/builders/linux_arm_host_engine.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@
"--no-lto",
"--target-os=linux",
"--linux-cpu=arm64",
"--prebuilt-dart-sdk",
"--rbe",
"--no-goma"
"--prebuilt-dart-sdk"
],
"name": "linux_profile_arm64",
"ninja": {
Expand Down Expand Up @@ -64,9 +62,7 @@
"debug",
"--target-os=linux",
"--linux-cpu=arm64",
"--prebuilt-dart-sdk",
"--rbe",
"--no-goma"
"--prebuilt-dart-sdk"
],
"name": "linux_debug_arm64",
"ninja": {
Expand Down Expand Up @@ -103,9 +99,7 @@
"release",
"--target-os=linux",
"--linux-cpu=arm64",
"--prebuilt-dart-sdk",
"--rbe",
"--no-goma"
"--prebuilt-dart-sdk"
],
"name": "linux_release_arm64",
"ninja": {
Expand Down
24 changes: 6 additions & 18 deletions ci/builders/linux_fuchsia.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
"--fuchsia-cpu",
"arm64",
"--runtime-mode",
"profile",
"--rbe",
"--no-goma"
"profile"
],
"name": "fuchsia_profile_arm64",
"ninja": {
Expand All @@ -40,9 +38,7 @@
"--fuchsia-cpu",
"arm64",
"--runtime-mode",
"release",
"--rbe",
"--no-goma"
"release"
],
"name": "fuchsia_release_arm64",
"ninja": {
Expand All @@ -67,9 +63,7 @@
"arm64",
"--runtime-mode",
"debug",
"--no-lto",
"--rbe",
"--no-goma"
"--no-lto"
],
"name": "fuchsia_debug_arm64",
"ninja": {
Expand All @@ -93,9 +87,7 @@
"--fuchsia-cpu",
"x64",
"--runtime-mode",
"profile",
"--rbe",
"--no-goma"
"profile"
],
"name": "fuchsia_profile_x64",
"ninja": {
Expand All @@ -118,9 +110,7 @@
"--fuchsia-cpu",
"x64",
"--runtime-mode",
"release",
"--rbe",
"--no-goma"
"release"
],
"name": "fuchsia_release_x64",
"ninja": {
Expand All @@ -144,9 +134,7 @@
"x64",
"--runtime-mode",
"debug",
"--no-lto",
"--rbe",
"--no-goma"
"--no-lto"
],
"name": "fuchsia_debug_x64",
"ninja": {
Expand Down
12 changes: 3 additions & 9 deletions ci/builders/linux_host_desktop_engine.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
"--runtime-mode",
"debug",
"--enable-fontconfig",
"--prebuilt-dart-sdk",
"--rbe",
"--no-goma"
"--prebuilt-dart-sdk"
],
"name": "host_debug",
"ninja": {
Expand Down Expand Up @@ -59,9 +57,7 @@
"profile",
"--no-lto",
"--enable-fontconfig",
"--prebuilt-dart-sdk",
"--rbe",
"--no-goma"
"--prebuilt-dart-sdk"
],
"name": "host_profile",
"ninja": {
Expand Down Expand Up @@ -94,9 +90,7 @@
"--runtime-mode",
"release",
"--enable-fontconfig",
"--prebuilt-dart-sdk",
"--rbe",
"--no-goma"
"--prebuilt-dart-sdk"
],
"name": "host_release",
"ninja": {
Expand Down
20 changes: 5 additions & 15 deletions ci/builders/linux_host_engine.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@
"--runtime-mode",
"debug",
"--unoptimized",
"--prebuilt-dart-sdk",
"--rbe",
"--no-goma"
"--prebuilt-dart-sdk"
],
"name": "host_debug_unopt",
"ninja": {
Expand All @@ -41,9 +39,7 @@
"--unoptimized",
"--prebuilt-dart-sdk",
"--target-dir",
"host_debug_impeller_vulkan",
"--rbe",
"--no-goma"
"host_debug_impeller_vulkan"
],
"name": "host_debug_impeller_vulkan",
"ninja": {
Expand Down Expand Up @@ -95,9 +91,7 @@
"--runtime-mode",
"debug",
"--prebuilt-dart-sdk",
"--build-embedder-examples",
"--rbe",
"--no-goma"
"--build-embedder-examples"
],
"name": "host_debug",
"ninja": {
Expand Down Expand Up @@ -148,9 +142,7 @@
"profile",
"--no-lto",
"--prebuilt-dart-sdk",
"--build-embedder-examples",
"--rbe",
"--no-goma"
"--build-embedder-examples"
],
"name": "host_profile",
"ninja": {
Expand Down Expand Up @@ -200,9 +192,7 @@
"--runtime-mode",
"release",
"--prebuilt-dart-sdk",
"--build-embedder-examples",
"--rbe",
"--no-goma"
"--build-embedder-examples"
],
"name": "host_release",
"ninja": {
Expand Down

0 comments on commit 6bf8067

Please sign in to comment.