add shader_lib to arm host builds
Bug:https://github.com/flutter/flutter/issues/115433
Change-Id: I90514de601a422ccc1936ee27dbb667a7b8b21aa
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/36921
Commit-Queue: Jonah Williams <jonahwilliams@google.com>
Reviewed-by: Zach Anderson <zra@google.com>
diff --git a/recipes/engine/engine_arm.expected/clobber.json b/recipes/engine/engine_arm.expected/clobber.json
index da63f5a..608c582 100644
--- a/recipes/engine/engine_arm.expected/clobber.json
+++ b/recipes/engine/engine_arm.expected/clobber.json
@@ -2059,6 +2059,46 @@
},
{
"cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "move",
+ "[CACHE]/builder/src/out/linux_debug_arm64/shader_lib",
+ "[CACHE]/builder/src/shader_lib"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "FLUTTER_PREBUILT_DART_SDK": "True",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "flutter:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Move the impellerc shader lib to the current directory in preparation for upload"
+ },
+ {
+ "cmd": [
"python",
"RECIPE_MODULE[flutter::zip]/resources/zip.py"
],
diff --git a/recipes/engine/engine_arm.expected/experimental.json b/recipes/engine/engine_arm.expected/experimental.json
index 2c72321..d497daf 100644
--- a/recipes/engine/engine_arm.expected/experimental.json
+++ b/recipes/engine/engine_arm.expected/experimental.json
@@ -1947,6 +1947,46 @@
},
{
"cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "move",
+ "[CACHE]/builder/src/out/linux_debug_arm64/shader_lib",
+ "[CACHE]/builder/src/shader_lib"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "FLUTTER_PREBUILT_DART_SDK": "True",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "flutter:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Move the impellerc shader lib to the current directory in preparation for upload"
+ },
+ {
+ "cmd": [
"python",
"RECIPE_MODULE[flutter::zip]/resources/zip.py"
],
diff --git a/recipes/engine/engine_arm.expected/experimental_upload.json b/recipes/engine/engine_arm.expected/experimental_upload.json
index e1ca37c..e707bca 100644
--- a/recipes/engine/engine_arm.expected/experimental_upload.json
+++ b/recipes/engine/engine_arm.expected/experimental_upload.json
@@ -1947,6 +1947,46 @@
},
{
"cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "move",
+ "[CACHE]/builder/src/out/linux_debug_arm64/shader_lib",
+ "[CACHE]/builder/src/shader_lib"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "FLUTTER_PREBUILT_DART_SDK": "True",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "flutter:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Move the impellerc shader lib to the current directory in preparation for upload"
+ },
+ {
+ "cmd": [
"python",
"RECIPE_MODULE[flutter::zip]/resources/zip.py"
],
diff --git a/recipes/engine/engine_arm.expected/gcloud_pubsub_failure.json b/recipes/engine/engine_arm.expected/gcloud_pubsub_failure.json
index 8b5414e..ed48240 100644
--- a/recipes/engine/engine_arm.expected/gcloud_pubsub_failure.json
+++ b/recipes/engine/engine_arm.expected/gcloud_pubsub_failure.json
@@ -1949,6 +1949,46 @@
},
{
"cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "move",
+ "[CACHE]/builder/src/out/linux_debug_arm64/shader_lib",
+ "[CACHE]/builder/src/shader_lib"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "FLUTTER_PREBUILT_DART_SDK": "True",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "flutter:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Move the impellerc shader lib to the current directory in preparation for upload"
+ },
+ {
+ "cmd": [
"python",
"RECIPE_MODULE[flutter::zip]/resources/zip.py"
],
diff --git a/recipes/engine/engine_arm.expected/linux.json b/recipes/engine/engine_arm.expected/linux.json
index 47a1a29..664a43a 100644
--- a/recipes/engine/engine_arm.expected/linux.json
+++ b/recipes/engine/engine_arm.expected/linux.json
@@ -1947,6 +1947,46 @@
},
{
"cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "move",
+ "[CACHE]/builder/src/out/linux_debug_arm64/shader_lib",
+ "[CACHE]/builder/src/shader_lib"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "FLUTTER_PREBUILT_DART_SDK": "True",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "flutter:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Move the impellerc shader lib to the current directory in preparation for upload"
+ },
+ {
+ "cmd": [
"python",
"RECIPE_MODULE[flutter::zip]/resources/zip.py"
],
diff --git a/recipes/engine/engine_arm.expected/linux_upload.json b/recipes/engine/engine_arm.expected/linux_upload.json
index 7eedfd6..48790ca 100644
--- a/recipes/engine/engine_arm.expected/linux_upload.json
+++ b/recipes/engine/engine_arm.expected/linux_upload.json
@@ -1947,6 +1947,46 @@
},
{
"cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "move",
+ "[CACHE]/builder/src/out/linux_debug_arm64/shader_lib",
+ "[CACHE]/builder/src/shader_lib"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "FLUTTER_PREBUILT_DART_SDK": "True",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "flutter:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Move the impellerc shader lib to the current directory in preparation for upload"
+ },
+ {
+ "cmd": [
"python",
"RECIPE_MODULE[flutter::zip]/resources/zip.py"
],
diff --git a/recipes/engine/engine_arm.expected/pull_request.json b/recipes/engine/engine_arm.expected/pull_request.json
index 2525eea..3a229d6 100644
--- a/recipes/engine/engine_arm.expected/pull_request.json
+++ b/recipes/engine/engine_arm.expected/pull_request.json
@@ -1949,6 +1949,46 @@
},
{
"cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "move",
+ "[CACHE]/builder/src/out/linux_debug_arm64/shader_lib",
+ "[CACHE]/builder/src/shader_lib"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "FLUTTER_PREBUILT_DART_SDK": "True",
+ "GOMA_DIR": "[CACHE]/goma/client"
+ },
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "flutter:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Move the impellerc shader lib to the current directory in preparation for upload"
+ },
+ {
+ "cmd": [
"python",
"RECIPE_MODULE[flutter::zip]/resources/zip.py"
],
diff --git a/recipes/engine/engine_arm.py b/recipes/engine/engine_arm.py
index 866b479..d099d34 100644
--- a/recipes/engine/engine_arm.py
+++ b/recipes/engine/engine_arm.py
@@ -38,10 +38,17 @@
ICU_DATA_PATH = 'third_party/icu/flutter/icudtl.dat'
GIT_REPO = (
'https://flutter.googlesource.com/mirrors/engine')
+IMPELLERC_SHADER_LIB_PATH = 'shader_lib'
PROPERTIES = InputProperties
ENV_PROPERTIES = EnvProperties
+def MoveShaderLib(api):
+ api.file.move(
+ 'Move the impellerc shader lib to the current directory in preparation for upload',
+ GetCheckoutPath(api).join('out', 'linux_debug_arm64',
+ IMPELLERC_SHADER_LIB_PATH), GetCheckoutPath(api).join(IMPELLERC_SHADER_LIB_PATH)
+ )
def GetCheckoutPath(api):
return api.path['cache'].join('builder', 'src')
@@ -158,6 +165,8 @@
'--linux-cpu=arm64', '--prebuilt-dart-sdk')
Build(api, 'linux_release_arm64')
+ MoveShaderLib(api)
+
UploadArtifacts(api, 'linux-arm64', [
ICU_DATA_PATH,
'out/linux_debug_arm64/flutter_tester',
