Bundletool upgrade to workaround QEMU support Partially addresses https://github.com/flutter/flutter/issues/90071 Change-Id: Ife97731749e94032e3aae09c12c703a78a196e6c Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/18100 Reviewed-by: Emmanuel Garcia <egarciad@google.com> Reviewed-by: Godofredo Contreras <godofredoc@google.com> Commit-Queue: Gary Qian <garyq@google.com>
diff --git a/recipes/flutter/deferred_components.expected/flutter_release_clean_exit.json b/recipes/flutter/deferred_components.expected/flutter_release_clean_exit.json index 0458928..ec27ae0 100644 --- a/recipes/flutter/deferred_components.expected/flutter_release_clean_exit.json +++ b/recipes/flutter/deferred_components.expected/flutter_release_clean_exit.json
@@ -613,7 +613,7 @@ "-root", "[CACHE]/builder/bundletool", "-ensure-file", - "flutter/android/bundletool vFt1jA0cUeZLmUCVR5NG2JVB-SgJ18GH_pVYKMOlfUIC", + "flutter/android/bundletool 0xeDa85nRhdQfi3iN2dK8PPluwI73z9San_Afuj3CfgC", "-max-threads", "0", "-json-output", @@ -651,7 +651,7 @@ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"\": [@@@", "@@@STEP_LOG_LINE@json.output@ {@@@", - "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-vFt1jA0cUeZLmUCV\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-0xeDa85nRhdQfi3i\", @@@", "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/bundletool\"@@@", "@@@STEP_LOG_LINE@json.output@ }@@@", "@@@STEP_LOG_LINE@json.output@ ]@@@",
diff --git a/recipes/flutter/deferred_components.expected/flutter_release_zombie_process.json b/recipes/flutter/deferred_components.expected/flutter_release_zombie_process.json index f055428..5526b2b 100644 --- a/recipes/flutter/deferred_components.expected/flutter_release_zombie_process.json +++ b/recipes/flutter/deferred_components.expected/flutter_release_zombie_process.json
@@ -613,7 +613,7 @@ "-root", "[CACHE]/builder/bundletool", "-ensure-file", - "flutter/android/bundletool vFt1jA0cUeZLmUCVR5NG2JVB-SgJ18GH_pVYKMOlfUIC", + "flutter/android/bundletool 0xeDa85nRhdQfi3iN2dK8PPluwI73z9San_Afuj3CfgC", "-max-threads", "0", "-json-output", @@ -651,7 +651,7 @@ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"\": [@@@", "@@@STEP_LOG_LINE@json.output@ {@@@", - "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-vFt1jA0cUeZLmUCV\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-0xeDa85nRhdQfi3i\", @@@", "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/bundletool\"@@@", "@@@STEP_LOG_LINE@json.output@ }@@@", "@@@STEP_LOG_LINE@json.output@ ]@@@",
diff --git a/recipes/flutter/deferred_components.py b/recipes/flutter/deferred_components.py index 2d96dab..e5b36e4 100644 --- a/recipes/flutter/deferred_components.py +++ b/recipes/flutter/deferred_components.py
@@ -95,7 +95,7 @@ bundletool_dir, api.cipd.EnsureFile().add_package( 'flutter/android/bundletool', - 'vFt1jA0cUeZLmUCVR5NG2JVB-SgJ18GH_pVYKMOlfUIC' + '0xeDa85nRhdQfi3iN2dK8PPluwI73z9San_Afuj3CfgC' ) ) test_dir = checkout_path.join('dev', 'integration_tests', 'deferred_components_test')