From d7cd0d1f3de7ae26c6c11b35bc01339e8c21a469 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Tue, 14 Jun 2022 17:43:27 -0700 Subject: [PATCH] Add a temporary target to help with the migration to gn artifacts. We'll save the file to the new and old locations while we transition from recipes generated artifacts to gn generated ones. Once we finish that implementation we will start standardizing artifact names and locations. Bug: flutter/flutter#105351 --- ci/builders/linux_android_debug_engine.json | 4 ++-- sky/dist/BUILD.gn | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ci/builders/linux_android_debug_engine.json b/ci/builders/linux_android_debug_engine.json index aefc834c34b8d..aa0d1dc52dace 100644 --- a/ci/builders/linux_android_debug_engine.json +++ b/ci/builders/linux_android_debug_engine.json @@ -87,7 +87,7 @@ "include_paths": [ "out/android_debug/zip_archives/android-arm/symbols.zip", "out/android_debug/zip_archives/flutter_download_io", - "out/android_debug/zip_archives/android-arm/sky_engine.zip", + "out/android_debug/zip_archives/sky_engine.zip", "out/android_debug/zip_archives/android-javadoc.zip" ] } @@ -106,7 +106,7 @@ "config": "android_debug", "targets": [ "flutter", - "flutter/sky/dist:zip", + "flutter/sky/dist:zip_old_location", "flutter/shell/platform/android:embedding_jars", "flutter/shell/platform/android:abi_jars", "flutter/shell/platform/android:robolectric_tests" diff --git a/sky/dist/BUILD.gn b/sky/dist/BUILD.gn index caa31ade1580b..54ffa42932cfa 100644 --- a/sky/dist/BUILD.gn +++ b/sky/dist/BUILD.gn @@ -37,6 +37,19 @@ if (is_android) { ] deps = [ ":sky_engine" ] } + + zip_bundle("zip_old_location") { + # TODO godofredoc: remove after we migrate the tool to use the new location. + # Bug: https://github.com/flutter/flutter/issues/105351 + output = "sky_engine.zip" + files = [ + { + source = "$root_build_dir/dist/packages/sky_engine" + destination = "sky_engine" + }, + ] + deps = [ ":sky_engine" ] + } } group("dist") {