SkQP: Tell the bot to compile a fat APK (test all the things).
CQ_INCLUDE_TRYBOTS=skia.primary:Build-Debian9-Clang-x86-devrel-Android_SKQP
Change-Id: I196d6845a3a8592302ebc425ea7ab09900fd246f
Reviewed-on: https://skia-review.googlesource.com/c/174586
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
diff --git a/infra/skqp/build_apk.sh b/infra/skqp/build_apk.sh
index d189002..d307f65 100755
--- a/infra/skqp/build_apk.sh
+++ b/infra/skqp/build_apk.sh
@@ -9,4 +9,4 @@
rm -rf /OUT/* # Clean out previous builds
export SKQP_OUTPUT_DIR=/OUT
fi
-"$(dirname "$0")"/../../tools/skqp/make_universal_apk.py x86
+"$(dirname "$0")"/../../tools/skqp/make_universal_apk.py arm arm64 x86 x64
diff --git a/infra/skqp/run_skqp.sh b/infra/skqp/run_skqp.sh
index 8f76200..8717a4b 100755
--- a/infra/skqp/run_skqp.sh
+++ b/infra/skqp/run_skqp.sh
@@ -21,7 +21,7 @@
# Some extra sleep to make sure the emulator is awake and ready for installation
sleep 10
-adb install -r /OUT/skqp-x86-debug.apk
+adb install -r /OUT/skqp-universal-debug.apk
adb logcat -c
tmp_file="$(mktemp "${TMPDIR:-/tmp}/skqp.XXXXXXXXXX")"