Skip to content

Commit

Permalink
[Flutter GPU] Upload flutter_gpu.zip upon successful completion of …
Browse files Browse the repository at this point in the history
…ci/android_debug. (#53107)

Part of flutter/flutter#131711.

Also, stops distributing `flutter_gpu` as part of the host artifacts, since it's not target-specific.

This enables us to use the same distribution mechanism as the `sky_engine` package.

Corresponding framework PR: flutter/flutter#149299
  • Loading branch information
bdero authored May 30, 2024
1 parent 2a9d2f5 commit 903809d
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 6 deletions.
5 changes: 4 additions & 1 deletion BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,10 @@ if (build_engine_artifacts) {
group("dist") {
testonly = true

deps = [ "//flutter/sky/dist" ]
deps = [
"//flutter/lib/gpu/dist",
"//flutter/sky/dist",
]
}

if (is_fuchsia && enable_unittests) {
Expand Down
4 changes: 0 additions & 4 deletions build/archives/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,6 @@ if (build_engine_artifacts && !is_android) {
source = "//flutter/impeller/compiler/shader_lib"
destination = "shader_lib"
},
{
source = "//flutter/lib/gpu"
destination = "flutter_gpu"
},
{
source = "$root_out_dir/${lib_prefix}path_ops$dll"
destination = "${lib_prefix}path_ops$dll"
Expand Down
4 changes: 3 additions & 1 deletion ci/builders/linux_android_debug_engine.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@
"out/ci/android_debug/zip_archives/android-arm/symbols.zip",
"out/ci/android_debug/zip_archives/download.flutter.io",
"out/ci/android_debug/zip_archives/sky_engine.zip",
"out/ci/android_debug/zip_archives/android-javadoc.zip"
"out/ci/android_debug/zip_archives/android-javadoc.zip",
"out/ci/android_debug/zip_archives/flutter_gpu.zip"
],
"realm": "production"
}
Expand Down Expand Up @@ -96,6 +97,7 @@
"targets": [
"flutter",
"flutter/sky/dist:zip_old_location",
"flutter/lib/gpu/dist:zip_old_location",
"flutter/shell/platform/android:embedding_jars",
"flutter/shell/platform/android:abi_jars",
"flutter/shell/platform/android:robolectric_tests"
Expand Down
47 changes: 47 additions & 0 deletions lib/gpu/dist/BUILD.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Copyright 2013 The Flutter Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

import("//flutter/build/zip_bundle.gni")

# Similar to `sky_engine`, zip up the `flutter_gpu` Dart package and upload
# it to GCS for distribution. This is only done during Android builds on CI.
#
# Then, the Flutter tool downloads and extracts `flutter_gpu.zip` into the
# package cache (`bin/cache/pkg`) during artifact initialization.
#
# Note that unlike with `sky_engine`, the `lib/gpu` directory is already a
# complete Dart package. So no additional build steps are necessary beyond
# zipping it up.

if (is_android) {
zip_bundle("zip") {
output = "$android_zip_archive_dir/flutter_gpu.zip"
files = [
{
source = "//flutter/lib/gpu"
destination = "flutter_gpu"
},
]
deps = []
}

zip_bundle("zip_old_location") {
# TODO: remove after we migrate the tool to use the new location.
# Bug: https://github.com/flutter/flutter/issues/105351
output = "flutter_gpu.zip"
files = [
{
source = "//flutter/lib/gpu"
destination = "flutter_gpu"
},
]
deps = []
}
}

group("dist") {
if (is_android) {
deps = [ ":zip" ]
}
}

0 comments on commit 903809d

Please sign in to comment.