zan1456/flutter
1
0
Fork 0
forked from firka/flutter
Code Pull Requests Activity

Use gclient_variables consistently. (flutter/engine#41162)

Browse Source 
Use gclient_variables consistently.
This commit is contained in:
godofredoc
2023-04-13 22:03:13 -07:00
committed by GitHub
parent 7a6bd02699
commit 08ead47f9c
10 changed files with 1530 additions and 1556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
engine/src/flutter/ci/builders/linux_android_aot_engine.json
View File

@@ -18,9 +18,6 @@
"device_type=none",
"os=Linux"
],
"gclient_custom_vars": {
"download_android_deps": false
},
"gn": [
"--runtime-mode",
"profile",
@@ -58,9 +55,6 @@
"device_type=none",
"os=Linux"
],
"gclient_custom_vars": {
"download_android_deps": false
},
"gn": [
"--runtime-mode",
"release",
@@ -99,9 +93,6 @@
"device_type=none",
"os=Linux"
],
"gclient_custom_vars": {
"download_android_deps": false
},
"gn": [
"--runtime-mode",
"release",
@@ -139,9 +130,6 @@
"device_type=none",
"os=Linux"
],
"gclient_custom_vars": {
"download_android_deps": false
},
"gn": [
"--android",
"--runtime-mode",
@@ -180,9 +168,6 @@
"device_type=none",
"os=Linux"
],
"gclient_custom_vars": {
"download_android_deps": false
},
"gn": [
"--runtime-mode",
"profile",
@@ -221,9 +206,6 @@
"device_type=none",
"os=Linux"
],
"gclient_custom_vars": {
"download_android_deps": false
},
"gn": [
"--runtime-mode",
"release",

9
engine/src/flutter/ci/builders/linux_android_debug_engine.json
View File

@@ -119,9 +119,6 @@
"device_type=none",
"os=Linux"
],
"gclient_custom_vars": {
"download_android_deps": false
},
"gn": [
"--android",
"--android-cpu=arm64",
@@ -154,9 +151,6 @@
"device_type=none",
"os=Linux"
],
"gclient_custom_vars": {
"download_android_deps": false
},
"gn": [
"--android",
"--android-cpu=x86",
@@ -189,9 +183,6 @@
"device_type=none",
"os=Linux"
],
"gclient_custom_vars": {
"download_android_deps": false
},
"gn": [
"--android",
"--android-cpu=x64",

6
engine/src/flutter/ci/builders/linux_arm_host_engine.json
View File

@@ -15,7 +15,7 @@
"device_type=none",
"os=Linux"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [
@@ -53,7 +53,7 @@
"device_type=none",
"os=Linux"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [
@@ -90,7 +90,7 @@
"device_type=none",
"os=Linux"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [

2946
engine/src/flutter/ci/builders/linux_web_engine.json
View File

File diff suppressed because it is too large Load Diff

12
engine/src/flutter/ci/builders/mac_android_aot_engine.json
View File

@@ -16,7 +16,7 @@
"os=Mac-12",
"cpu=x86"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [
@@ -50,7 +50,7 @@
"os=Mac-12",
"cpu=x86"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [
@@ -85,7 +85,7 @@
"os=Mac-12",
"cpu=x86"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [
@@ -120,7 +120,7 @@
"os=Mac-12",
"cpu=x86"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [
@@ -154,7 +154,7 @@
"os=Mac-12",
"cpu=x86"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [
@@ -189,7 +189,7 @@
"os=Mac-12",
"cpu=x86"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [

29
engine/src/flutter/ci/builders/mac_host_engine.json
View File

@@ -19,7 +19,7 @@
"cpu=x86",
"mac_model=Macmini8,1"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [
@@ -37,7 +37,7 @@
"flutter/build/archives:artifacts",
"flutter/build/archives:dart_sdk_archive",
"flutter/build/archives:flutter_embedder_framework",
"flutter/build/dart:copy_dart_sdk",
"flutter/build/dart:copy_dart_sdk",
"flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
"flutter/tools/font-subset",
"flutter:unittests"
@@ -57,7 +57,7 @@
"script": "flutter/testing/run_tests.py",
"type": "local"
}
]
]
},
{
"archives": [
@@ -76,7 +76,7 @@
"cpu=x86",
"mac_model=Macmini8,1"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [
@@ -90,7 +90,7 @@
"ninja": {
"config": "host_profile",
"targets": [
"flutter/build/dart:copy_dart_sdk",
"flutter/build/dart:copy_dart_sdk",
"flutter/build/archives:archive_gen_snapshot",
"flutter/build/archives:artifacts",
"flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
@@ -132,9 +132,12 @@
"mac_model=Macmini8,1"
],
"dependencies": [
{"dependency": "goldctl", "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"}
{
"dependency": "goldctl",
"version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
}
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [
@@ -150,7 +153,7 @@
"targets": [
"flutter/build/archives:archive_gen_snapshot",
"flutter/build/archives:artifacts",
"flutter/build/dart:copy_dart_sdk",
"flutter/build/dart:copy_dart_sdk",
"flutter/impeller/golden_tests:impeller_golden_tests",
"flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
"flutter/tools/font-subset",
@@ -189,7 +192,7 @@
"os=Mac-12",
"cpu=x86"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [
@@ -205,7 +208,7 @@
"ninja": {
"config": "mac_debug_arm64",
"targets": [
"flutter/tools/font-subset",
"flutter/tools/font-subset",
"flutter/build/archives:archive_gen_snapshot",
"flutter/build/archives:artifacts",
"flutter/build/archives:dart_sdk_archive",
@@ -221,7 +224,7 @@
"type": "gcs",
"include_paths": [
"out/mac_profile_arm64/zip_archives/darwin-arm64-profile/artifacts.zip"
],
],
"name": "mac_profile_arm64"
}
],
@@ -230,7 +233,7 @@
"os=Mac-12",
"cpu=x86"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [
@@ -269,7 +272,7 @@
"os=Mac-12",
"cpu=x86"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [

22
engine/src/flutter/ci/builders/mac_ios_engine.json
View File

@@ -56,7 +56,7 @@
]
}
},
{
{
"drone_dimensions": [
"device_type=none",
"mac_model=Macmini8,1",
@@ -76,7 +76,7 @@
]
}
},
{
{
"drone_dimensions": [
"device_type=none",
"mac_model=Macmini8,1",
@@ -114,7 +114,7 @@
"script": "flutter/sky/tools/create_full_ios_framework.py",
"language": "python3"
},
{
{
"name": "Profile-ios-Flutter.xcframework",
"parameters": [
"--dst",
@@ -136,7 +136,7 @@
],
"script": "flutter/tools/gen_objcdoc.sh"
},
{
{
"name": "Release-ios-Flutter.xcframework",
"parameters": [
"--dst",
@@ -170,27 +170,27 @@
{
"source": "out/debug/artifacts.zip",
"destination": "ios/artifacts.zip",
"realm": "production"
"realm": "production"
},
{
{
"source": "out/profile/artifacts.zip",
"destination": "ios-profile/artifacts.zip",
"realm": "production"
"realm": "production"
},
{
"source": "out/debug/ios-objcdoc.zip",
"destination": "ios-objcdoc.zip",
"realm": "production"
"realm": "production"
},
{
{
"source": "out/release/artifacts.zip",
"destination": "ios-release/artifacts.zip",
"realm": "production"
"realm": "production"
},
{
"source": "out/release/Flutter.dSYM.zip",
"destination": "ios-release/Flutter.dSYM.zip",
"realm": "production"
"realm": "production"
}
]
}

32
engine/src/flutter/ci/builders/mac_unopt.json
View File

@@ -5,8 +5,7 @@
{
"base_path": "out/host_debug_unopt/zip_archives/",
"type": "gcs",
"include_paths": [
],
"include_paths": [],
"name": "host_debug_unopt"
}
],
@@ -16,21 +15,20 @@
"cpu=x86",
"mac_model=Macmini8,1"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [
"--runtime-mode",
"debug",
"--unoptimized",
"--no-lto",
"--prebuilt-dart-sdk"
"--runtime-mode",
"debug",
"--unoptimized",
"--no-lto",
"--prebuilt-dart-sdk"
],
"name": "host_debug_unopt",
"ninja": {
"config": "host_debug_unopt",
"targets": [
]
"targets": []
},
"tests": [
{
@@ -53,14 +51,15 @@
{
"base_path": "out/ios_debug_sim/zip_archives/",
"type": "gcs",
"include_paths": [
],
"include_paths": [],
"name": "ios_debug_sim"
}
],
"properties": {
"$flutter/osx_sdk": {
"runtime_versions": [ "ios-16-0_14a5294e" ],
"runtime_versions": [
"ios-16-0_14a5294e"
],
"sdk_version": "14a5294e"
}
},
@@ -69,7 +68,7 @@
"os=Mac-12",
"cpu=x86"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [
@@ -111,7 +110,6 @@
"script": "flutter/testing/scenario_app/run_ios_tests.sh",
"type": "local"
}
]
},
{
@@ -129,7 +127,7 @@
"os=Mac-12",
"cpu=arm64"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [
@@ -170,7 +168,7 @@
"os=Mac-12",
"cpu=arm64"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [

6
engine/src/flutter/ci/builders/windows_arm_host_engine.json
View File

@@ -20,7 +20,7 @@
"device_type=none",
"os=Windows-10"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [
@@ -59,7 +59,7 @@
"device_type=none",
"os=Windows-10"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [
@@ -95,7 +95,7 @@
"device_type=none",
"os=Windows-10"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"generators": {},

6
engine/src/flutter/ci/builders/windows_host_engine.json
View File

@@ -20,7 +20,7 @@
"device_type=none",
"os=Windows-10"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [
@@ -71,7 +71,7 @@
"device_type=none",
"os=Windows-10"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"gn": [
@@ -105,7 +105,7 @@
"device_type=none",
"os=Windows-10"
],
"gclient_custom_vars": {
"gclient_variables": {
"download_android_deps": false
},
"generators": {},