SkQP: experimental docker script cleanup, try 2

No-Try: true
Change-Id: Icc62d2d6b0f35de757022fc7fdde1f748658c060
Reviewed-on: https://skia-review.googlesource.com/c/178925
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
This commit is contained in:
Hal Canary 2018-12-18 11:01:25 -05:00 committed by Skia Commit-Bot
parent f34131ae9b
commit 6d7f9d6f28

View File

@ -16,27 +16,27 @@ SKIA_ROOT="$(cd "$(dirname "$0")/../.."; pwd)"
cd "${SKIA_ROOT}/infra/skqp/docker"
docker build -t android-skqp ./android-skqp/
docker run --rm --privileged -d --name android_em \
docker run --rm -d --name android_em \
--env=DEVICE="Samsung Galaxy S6" \
--volume="$SKIA_ROOT":/SRC \
--volume="$OUT":/OUT \
--volume="$BUILD":/BUILD \
android-skqp
docker exec \
--env=SKQP_OUTPUT_DIR=/OUT \
--env=SKQP_BUILD_DIR=/BUILD \
android_em /SRC/tools/skqp/make_universal_apk.py
docker exec \
--env=SKQP_OUTPUT_DIR=/OUT \
--env=SKQP_BUILD_DIR=/BUILD \
android_em find '/BUILD/.' '!' -name '.' -prune -exec rm -rf '{}' '+'
docker exec android_em find '/BUILD/.' '!' -name '.' -prune -exec rm -rf '{}' '+'
if [ -f "$OUT"/skqp-universal-debug.apk ]; then
docker exec \
--env=SKQP_OUTPUT_DIR=/OUT \
--env=SKQP_BUILD_DIR=/BUILD \
android_em chmod 0666 /OUT/*.apk
docker exec android_em find /OUT -type f -exec chmod 0666 '{}' '+'
fi
docker kill android_em
rmdir "$BUILD"
ls -l "$OUT"/*.apk 2> /dev/null