SkQP: branching tools updated.

1.  get_gold_export_url.py becomes get_gold_results.py

2.  README_GENERATING_MODELS.md updated with changed and more
    complete instructions.

No-Try: true
Change-Id: I7fb84ad99e3049717ea9a572f8558ed2f73d412c
Reviewed-on: https://skia-review.googlesource.com/c/184600
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>

2 files changed, 32 insertions, 9 deletions

diff --git a/tools/skqp/README_GENERATING_MODELS.md b/tools/skqp/README_GENERATING_MODELS.md
index a4b5b0b198..b36ba54655 100644
--- a/tools/skqp/README_GENERATING_MODELS.md
+++ b/tools/skqp/README_GENERATING_MODELS.md
@@ -4,21 +4,24 @@ How SkQP Generates Render Test Models
 We will, at regular intervals, generate new models from the [master branch of
 Skia][1].  Here is how that process works:
 
+0.  Choose a commit to make the branch from
+
+        COMMIT=origin/master
+
 1.  Get the positively triaged results from Gold:
 
         cd SKIA_SOURCE_DIRECTORY
         git fetch origin
-        git checkout origin/master
-        tools/skqp/get_gold_export_url.py HEAD~10 HEAD
-
-    Open the resulting URL in a browser and download the resulting `meta.json` file.
+        git checkout "$COMMIT"
+        python tools/skqp/get_gold_results.py "${COMMIT}~10" "$COMMIT"
 
-        bin/sysopen $(tools/skqp/get_gold_export_url.py HEAD~10 HEAD)
+    This will produce a file `meta_YYYMMMDDD_HHHMMMSS_COMMIT_COMMIT.json` in
+    the current directory.
 
 2.  From a checkout of Skia's master branch, execute:
 
         cd SKIA_SOURCE_DIRECTORY
-        git checkout origin/master
+        git checkout "$COMMIT"
         tools/skqp/cut_release META_JSON_FILE
 
     This will create the following files:
@@ -38,6 +41,19 @@ Skia][1].  Here is how that process works:
         git push origin HEAD:refs/for/skqp/dev
         bin/sysopen https://review.skia.org/$(bin/gerrit-number HEAD)
 
+    (Optional) Make a SkQP APK.
+
+        tools/skqp/docker_build_universal_apk.sh
+
+    (Optional) Test the SkQP APK:
+
+        adb uninstall org.skia.skqp
+        tools/skqp/test_apk.sh LOCATION/skqp-universal-debug.apk
+
+    (Once changes land) Upload the SkQP APK.
+
+        tools/skqp/upload_apk LOCATION/skqp-universal-debug.apk
+
 
 `tools/skqp/cut_release`
 ------------------------
diff --git a/tools/skqp/get_gold_export_url.py b/tools/skqp/get_gold_results.py
index ed98156d0c..ebf23f2831 100755
--- a/tools/skqp/get_gold_export_url.py
+++ b/tools/skqp/get_gold_results.py
@@ -7,6 +7,7 @@
 import os
 import subprocess
 import sys
+import time
 import urllib
 
 def gold_export_url(first_commit, last_commit):
@@ -18,7 +19,7 @@ def gold_export_url(first_commit, last_commit):
         ('neg',    'false'),
         ('unt',    'false')
     ]
-    return 'https://gold.skia.org/json/export?' + urllib.urlencode(query)
+    return 'https://public-gold.skia.org/json/export?' + urllib.urlencode(query)
 
 def git_rev_parse(rev):
     return subprocess.check_output(['git', 'rev-parse', rev]).strip()
@@ -27,8 +28,14 @@ def main(args):
     if len(args) != 2:
         sys.stderr.write('Usage:\n  %s FIRST_COMMIT LAST_COMMIT\n' % __file__)
         sys.exit(1)
-    sys.stdout.write(gold_export_url(git_rev_parse(args[0]),
-                                     git_rev_parse(args[1])) + '\n')
+    c1 = git_rev_parse(args[0])
+    c2 = git_rev_parse(args[1])
+    now = time.strftime("%Y%m%d_%H%M%S", time.gmtime())
+    url = gold_export_url(c1, c2)
+    sys.stdout.write(url + '\n')
+    filename = 'meta_%s_%s_%s.json' % (now, c1[:16], c2[:16])
+    urllib.urlretrieve(url, filename)
+    sys.stdout.write('\n' + filename + '\n')
 
 if __name__ == '__main__':
     main(sys.argv[1:])