commit 3034776433e8309a87c90609a9993bf475938d6b
author Derek Sollenberger <djsollen@google.com> Wed Jan 12 13:24:38 2022 -0500
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Mon Jan 31 15:43:48 2022 +0000
tree 1da49ce346b1e1c45bdbef93daa9a1216c6b6988
parent 1fad4c0080f216686c699fa3edc1da3a8078722f

Cleanup SkQP build scripts

Change-Id: Ie226bc605baad4788976ad4c37dc455d36b11793
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/494136
Reviewed-by: Nathaniel Nifong <nifong@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>

tools/skqp/make_universal_apk.py

diff --git a/tools/skqp/make_universal_apk.py b/tools/skqp/make_universal_apk.py
index bbddeb1..2cb75de 100755
--- a/tools/skqp/make_universal_apk.py
+++ b/tools/skqp/make_universal_apk.py
@@ -32,7 +32,6 @@
 import sys
 
 import create_apk
-import download_model
 
 def make_apk(opts):
     assert '/' in [os.sep, os.altsep]  # 'a/b' over os.path.join('a', 'b')
@@ -40,21 +39,12 @@
     skia_dir = os.path.dirname(__file__) + '/../..'
     create_apk.makedirs(opts.build_dir)
     assets_dir = skia_dir + '/platform_tools/android/apps/skqp/src/main/assets'
-    gmkb = assets_dir + '/gmkb'
     resources_path = assets_dir + '/resources'
 
-    with create_apk.RemoveFiles(resources_path, gmkb):  # always clean up
-        create_apk.remove(gmkb)
-        create_apk.make_symlinked_subdir(gmkb, opts.build_dir)
-
+    with create_apk.RemoveFiles(resources_path):  # always clean up
         create_apk.remove(resources_path)
         os.symlink('../../../../../../../resources', resources_path)
 
-        if os.path.exists(assets_dir + '/files.checksum'):
-            download_model.main()
-        else:
-            sys.stderr.write(
-                    '\n* * *  Note: SkQP models are missing!  * * *\n\n')
         create_apk.create_apk(opts)
 
 def main():

tools/skqp/run_apk.sh

diff --git a/tools/skqp/run_apk.sh b/tools/skqp/run_apk.sh
old mode 100644
new mode 100755
index b35933e..5529a5c
--- a/tools/skqp/run_apk.sh
+++ b/tools/skqp/run_apk.sh
@@ -20,7 +20,7 @@
 
 set -x
 
-timeout 60 adb wait-for-device || exit 1
+adb wait-for-device || exit 1
 
 sleep ${SKQP_SLEEP:-0}