AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SkQP: update script tools/skqp/make_universal_apk

Browse Source 
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>
This commit is contained in:
Hal Canary 2018-10-04 13:17:48 -04:00 committed by Skia Commit-Bot
parent 080e77f06b
commit d95303e10c
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tools/skqp/make_universal_apk
View File

@ -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
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"