Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

set -e on assemble_apk.sh #17588

Merged
merged 2 commits into from
Apr 8, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions testing/scenario_app/assemble_apk.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#!/bin/bash

set -e

pushd "${BASH_SOURCE%/*}/../../.."
./flutter/tools/gn --unopt
ninja -C out/host_debug_unopt sky_engine sky_services
Comment on lines +6 to +7
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@blasten - I believe this is a better fix than changing the pubspec, since we have other modes that want to run jit and need debug mode built. The expectation is that everyone runs at least this for host_debug_unopt (it's a pretty fast build step, just involves copying/repackaging dart files).

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any benefit in doing this step in the LUCI recipe before assemble_apk.sh is invoked?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At some point that's how it worked I think. The danger is that someone "fixes" the recipe without realizing its breaking this script - this also lets the script run locally.

If this was doing actual C compilation it could be a problem too, because you have to make sure goma is available/running and LUCI likes to handle that special, but it should be fine here. These tasks just copy dart files around.

popd

pushd "${BASH_SOURCE%/*}"
./compile_android_aot.sh "$1" "$2"
popd
Expand Down