Enable AR instrumentation tests on Oreo

Enables monochrome_public_test_ar_apk on Oreo Phone Tester and adds in
the necessary changes to download ArCore and include it in the isolate.

Bug: 851020
Change-Id: Id98519c43acc3ec4ee203c78e04457d8cd6f92ad
Reviewed-on: https://chromium-review.googlesource.com/1136028Reviewed-by: Ian Vollick <vollick@chromium.org>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#578741}

DEPS

@@ -2222,6 +2222,15 @@ hooks = [
                 'src/third_party/gvr-android-sdk/test-apks/update.py',
     ],
   },
+  # DOWNLOAD AR test APKs only if the environment variable is set
+  {
+    'name': 'ar_test_apks',
+    'pattern': '.',
+    'condition': 'checkout_android',
+    'action': [ 'python',
+                'src/third_party/arcore-android-sdk/test-apks/update.py',
+    ],
+  },
   # Download Oculus SDK if appropriate.
   {
     'name': 'libovr',

testing/buildbot/chromium.android.json

@@ -16586,6 +16586,50 @@
         },
         "test": "chrome_public_test_vr_apk"
       },
+      {
+        "args": [
+          "--additional-apk=//third_party/arcore-android-sdk/test-apks/arcore/arcore_current.apk",
+          "--gs-results-bucket=chromium-result-details",
+          "--recover-devices"
+        ],
+        "merge": {
+          "args": [
+            "--bucket",
+            "chromium-result-details",
+            "--test-name",
+            "monochrome_public_test_ar_apk"
+          ],
+          "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "device_os": "OPR3.170623.008",
+              "device_type": "marlin",
+              "os": "Android"
+            }
+          ],
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ]
+        },
+        "test": "monochrome_public_test_ar_apk"
+      },
       {
         "args": [
           "--gs-results-bucket=chromium-result-details",

testing/buildbot/gn_isolate_map.pyl

@@ -867,6 +867,10 @@
       "apks/MonochromePublic.apk",
     ],
   },
+  "monochrome_public_test_ar_apk": {
+    "label": "//chrome/android:monochrome_public_test_ar_apk",
+    "type": "console_test_launcher",
+  },
   "monochrome_static_initializers": {
     "label": "//chrome/android:monochrome_static_initializers",
     "type": "additional_compile_target",

testing/buildbot/test_suites.pyl

@@ -201,6 +201,14 @@
     },
   },
 
+  'android_ar_gtests': {
+    'monochrome_public_test_ar_apk': {
+      'args': [
+        '--additional-apk=//third_party/arcore-android-sdk/test-apks/arcore/arcore_current.apk'
+      ],
+    },
+  },
+
   'android_ddready_vr_gtests': {
     'chrome_public_test_vr_apk-ddready-cardboard': {
       'args': [
@@ -2195,6 +2203,7 @@
   # Composition test suites.
   'android_oreo_gtests': [
     'android_ddready_vr_gtests',
+    'android_ar_gtests',
     'android_oreo_standard_gtests',
   ],
 

third_party/.gitignore

@@ -27,7 +27,8 @@
 /apache-win32/modules/*.so
 /apache-win32/modules/*.dll
 /apk-patch-size-estimator/lib/
-/arcore-android-sdk
+/arcore-android-sdk/src/
+/arcore-android-sdk/test-apks/arcore/*.apk
 /asan
 /auto/src
 /bazel/desugar/Desugar.jar

third_party/arcore-android-sdk/README.chromium

@@ -18,6 +18,9 @@ Chromium that is not publicly distributed elsewhere. We have also stripped the
 
 Also, added BUILD.gn for compilation in chrome.
 
+Added the test-apks/ subdirectory for storing production versions of AR APKs,
+namely ArCore, for testing.
+
 IMPORTANT: make sure to change chrome/android/java/AndroidManifest.xml
 com.google.ar.core.min_apk_version attribute if a newer version of the
 ARCore APK is required to maintain compatibility with this SDK.
@@ -26,6 +29,8 @@ The LICENSE file is taken from
  * https://github.com/google-ar/arcore-unity-sdk/blob/master/LICENSE
 
 Changes:
+2018-07-26 - Added test-apks/ subdirectory for storing production versions of AR
+             APKs for testing.
 2018-07-19 - Updated BUILD.gn to support secondary abi (the previous change for
              arm64 support turned out to be insufficient) and removed the unused
              libarcore_sdk target.

third_party/arcore-android-sdk/test-apks/arcore/apk_version_history.txt

+v1.3 f8004b83fc757d7724abdd492ac74cd7a9ab8e62

third_party/arcore-android-sdk/test-apks/arcore/arcore_current.apk.sha1

+f8004b83fc757d7724abdd492ac74cd7a9ab8e62
\ No newline at end of file

third_party/arcore-android-sdk/test-apks/update.py

+import os
+import subprocess
+import sys
+
+THIS_DIR = os.path.abspath(os.path.dirname(__file__))
+ARCORE_DIR = os.path.abspath(os.path.join(THIS_DIR, 'arcore'))
+
+def main():
+  # TODO(https://crbug.com/853898): Rename this to DOWNLOAD_XR_TEST_APKS
+  if 'DOWNLOAD_VR_TEST_APKS' not in os.environ:
+    return 0
+  subprocess.check_call(['download_from_google_storage',
+                                '--bucket', 'chromium-ar-test-apks/arcore',
+                                '-d', ARCORE_DIR])
+  return 0
+
+if __name__ == '__main__':
+  sys.exit(main())