diff options
| author | Hal Canary <halcanary@google.com> | 2018-10-04 13:17:48 -0400 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-10-04 18:00:22 +0000 |
| commit | d95303e10cbccd30e28a52a7533352497f4b5298 (patch) | |
| tree | 3a84ed64abb357481c7f893759393b20caf27604 /tools/skqp | |
| parent | 080e77f06b7477c9035d6dc72838df21121beba0 (diff) | |
| download | skqp-d95303e10cbccd30e28a52a7533352497f4b5298.tar.gz | |
SkQP: update script tools/skqp/make_universal_apk
works if skqp/src/main/assets/files.checksum is missing.
works with new version of tools that put APK in new place.
No-Try: true
Change-Id: I83649c50fe88a4d80204200c609603b4bed0b6b0
Reviewed-on: https://skia-review.googlesource.com/c/159660
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'tools/skqp')
| -rwxr-xr-x | tools/skqp/make_universal_apk | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/tools/skqp/make_universal_apk b/tools/skqp/make_universal_apk index 0ebe036ac1..1ad7b01363 100755 --- a/tools/skqp/make_universal_apk +++ b/tools/skqp/make_universal_apk @@ -47,9 +47,14 @@ if [ -z "${APK_OUTPUT_DIR}" ]; then fi cd "$(dirname "$0")/../.." -python tools/skqp/download_model -if [ -z "$SKQP_EXTRA_MODELS" ]; then - python tools/skqp/remove_unneeded_assets + +if [ -f platform_tools/android/apps/skqp/src/main/assets/files.checksum ]; then + python tools/skqp/download_model + if [ -z "$SKQP_EXTRA_MODELS" ]; then + python tools/skqp/remove_unneeded_assets + fi +else + printf '\n* * *\n\nSkQP models are missing!!!!\n\n* * *\n\n' fi python tools/skqp/setup_resources @@ -84,11 +89,25 @@ for ARCH in $*; do cp -a $BUILD/$LIB $DST/$LIB done + +APK_BUILD_DIR=platform_tools/android/apps/$APP/build/outputs/apk +rm -rf "$APK_BUILD_DIR" ( cd platform_tools/android apps/gradlew -p apps/$APP -P suppressNativeBuild :$APP:assembleUniversalDebug ) mkdir -p $APK_OUTPUT_DIR -cp platform_tools/android/apps/$APP/build/outputs/apk/$APP-universal-debug.apk "${APK_OUTPUT_DIR}/" +APK_BASENAME="$APP-universal-debug.apk" + +for APK_PATH in \ + "$APK_BUILD_DIR/universal/debug/$APK_BASENAME" \ + "$APK_BUILD_DIR/$APK_BASENAME" \ + ; do + if [ -f "$APK_PATH" ]; then + cp "$APK_PATH" "${APK_OUTPUT_DIR}/$APK_BASENAME" + break + fi +done +ls -l "${APK_OUTPUT_DIR}/$APK_BASENAME" |