From a28de3048f2927955843bb590575187bc0ba0e45 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Wed, 8 Apr 2020 09:44:40 -0700 Subject: [PATCH 1/2] set -e on assemble_apk.sh --- testing/scenario_app/assemble_apk.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testing/scenario_app/assemble_apk.sh b/testing/scenario_app/assemble_apk.sh index 9eb3cbfe7e0bc..3e4fa496a1bc8 100755 --- a/testing/scenario_app/assemble_apk.sh +++ b/testing/scenario_app/assemble_apk.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -e + pushd "${BASH_SOURCE%/*}" ./compile_android_aot.sh "$1" "$2" popd From a5621620561b3b66d321bcd221840863672d0067 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Wed, 8 Apr 2020 13:06:46 -0700 Subject: [PATCH 2/2] build the necessary artifacts --- testing/scenario_app/assemble_apk.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testing/scenario_app/assemble_apk.sh b/testing/scenario_app/assemble_apk.sh index 3e4fa496a1bc8..3e75dcc5e9af4 100755 --- a/testing/scenario_app/assemble_apk.sh +++ b/testing/scenario_app/assemble_apk.sh @@ -2,6 +2,11 @@ set -e +pushd "${BASH_SOURCE%/*}/../../.." + ./flutter/tools/gn --unopt + ninja -C out/host_debug_unopt sky_engine sky_services +popd + pushd "${BASH_SOURCE%/*}" ./compile_android_aot.sh "$1" "$2" popd