| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Coverage__dbg_.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Coverage__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Coverage__dbg_.json
|
| index 6f6729d59fd351760f9374c17d1a11c20d7f2e07..d97fd88e7881552bd2281008a887d25d1fbe21b4 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Coverage__dbg_.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Coverage__dbg_.json
|
| @@ -4,7 +4,7 @@
|
| "python",
|
| "-u",
|
| "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "[BUILDER_CACHE]/android",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -47,7 +47,7 @@
|
| "--force",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -188,13 +188,13 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_/src",
|
| + "cwd": "[BUILDER_CACHE]/android/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| "GYP_CROSSCOMPILE": "1",
|
| "GYP_DEFINES": "OS=android component=static_library emma_coverage=1 emma_filter='org.chromium.*' fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=arm use_goma=1",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| },
|
| @@ -202,14 +202,14 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/testing/scripts/get_compile_targets.py",
|
| + "[BUILDER_CACHE]/android/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| "Debug",
|
| "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]/Android_Coverage__dbg_/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| + "{\"checkout\": \"[BUILDER_CACHE]/android/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| "--properties",
|
| "{\"buildername\": \"Android Coverage (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
|
| ],
|
| @@ -224,12 +224,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/testing/buildbot/chromium.fyi.json",
|
| + "[BUILDER_CACHE]/android/src/testing/buildbot/chromium.fyi.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec (chromium.fyi.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]/Android_Coverage__dbg_/src/testing/buildbot/chromium.fyi.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]/android/src/testing/buildbot/chromium.fyi.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -250,10 +250,10 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/Debug/debug_info_dumps",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/Debug/test_logs",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/build_product.zip",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src"
|
| + "[BUILDER_CACHE]/android/src/out/Debug/debug_info_dumps",
|
| + "[BUILDER_CACHE]/android/src/out/Debug/test_logs",
|
| + "[BUILDER_CACHE]/android/src/out/build_product.zip",
|
| + "[BUILDER_CACHE]/android/src"
|
| ],
|
| "name": "clean local files",
|
| "~followup_annotations": [
|
| @@ -275,8 +275,8 @@
|
| {
|
| "allow_subannotations": false,
|
| "cmd": [
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/tree_truth.sh",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src",
|
| + "[BUILDER_CACHE]/android/src/build/tree_truth.sh",
|
| + "[BUILDER_CACHE]/android/src",
|
| "src"
|
| ],
|
| "name": "tree truth steps"
|
| @@ -286,7 +286,7 @@
|
| "python",
|
| "-u",
|
| "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/Debug"
|
| + "[BUILDER_CACHE]/android/src/out/Debug"
|
| ],
|
| "name": "rmtree build directory",
|
| "~followup_annotations": [
|
| @@ -313,7 +313,7 @@
|
| "--target",
|
| "Debug",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src",
|
| + "[BUILDER_CACHE]/android/src",
|
| "--build-archive-url",
|
| "gs://test-domain/test-archive.zip",
|
| "--master-name",
|
| @@ -328,13 +328,13 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::adb]/resources/list_devices.py",
|
| - "['[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
|
| + "['[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "List adb devices",
|
| "~followup_annotations": [
|
| @@ -349,13 +349,13 @@
|
| "python",
|
| "-u",
|
| "\nimport subprocess\nimport sys\nadb_path = sys.argv[1]\nfor device in sys.argv[2:]:\n print 'Attempting to root device %s ...' % (device)\n subprocess.check_call([adb_path, '-s', device, 'root'])\n subprocess.check_call([adb_path, '-s', device, 'wait-for-device'])\n print 'Finished rooting device %s' % (device)\n",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "014E1F310401C009"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "Root devices",
|
| "~followup_annotations": [
|
| @@ -375,15 +375,15 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/symlink.py",
|
| + "[BUILDER_CACHE]/android/src/build/symlink.py",
|
| "-f",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "~/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "create adb symlink"
|
| },
|
| @@ -391,14 +391,14 @@
|
| "cmd": [
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
|
| "--",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android/adb_logcat_monitor.py",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/logcat",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android/src/build/android/adb_logcat_monitor.py",
|
| + "[BUILDER_CACHE]/android/src/out/logcat",
|
| + "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "spawn_logcat_monitor"
|
| },
|
| @@ -409,30 +409,30 @@
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py",
|
| "--verbose",
|
| "--adb-path",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "authorize_adb_devices"
|
| },
|
| {
|
| "cmd": [
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",
|
| + "[BUILDER_CACHE]/android/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",
|
| "--blacklist-file",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android/src/out/bad_devices.json",
|
| "--known-devices-file",
|
| "[HOME]/.android/known_devices.json",
|
| "--adb-path",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "-v"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "device_recovery"
|
| },
|
| @@ -440,43 +440,43 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android/provision_devices.py",
|
| + "[BUILDER_CACHE]/android/src/build/android/provision_devices.py",
|
| "--adb-path",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "--blacklist-file",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android/src/out/bad_devices.json",
|
| "--output-device-blacklist",
|
| "/path/to/tmp/json",
|
| "-t",
|
| "Debug"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "provision_devices"
|
| },
|
| {
|
| "cmd": [
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/catapult/devil/devil/android/tools/device_status.py",
|
| + "[BUILDER_CACHE]/android/src/third_party/catapult/devil/devil/android/tools/device_status.py",
|
| "--json-output",
|
| "/path/to/tmp/json",
|
| "--blacklist-file",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android/src/out/bad_devices.json",
|
| "--known-devices-file",
|
| "[HOME]/.android/known_devices.json",
|
| "--buildbot-path",
|
| "/home/chrome-bot/.adb_device_info",
|
| "--adb-path",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "-v",
|
| "--overwrite-known-devices-files"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "device_status",
|
| "~followup_annotations": [
|
| @@ -585,15 +585,15 @@
|
| "/tmp/device_monitor.pid",
|
| "--",
|
| "RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "[\"07a00ca4\"]",
|
| "--blacklist-file",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/bad_devices.json"
|
| + "[BUILDER_CACHE]/android/src/out/bad_devices.json"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "spawn_device_monitor"
|
| },
|
| @@ -601,21 +601,21 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/Debug/bin/run_android_webview_test_apk",
|
| + "[BUILDER_CACHE]/android/src/out/Debug/bin/run_android_webview_test_apk",
|
| "--blacklist-file",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android/src/out/bad_devices.json",
|
| "--verbose",
|
| "--coverage-dir",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/Debug/coverage",
|
| + "[BUILDER_CACHE]/android/src/out/Debug/coverage",
|
| "--json-results-file",
|
| "/path/to/tmp/json",
|
| "--adb-path",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "AndroidWebViewTest",
|
| "~followup_annotations": [
|
| @@ -644,10 +644,10 @@
|
| "--chrome-revision",
|
| "refs/heads/master@{#170242}"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "Upload to test-results [AndroidWebViewTest]"
|
| },
|
| @@ -655,21 +655,21 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/Debug/bin/run_chrome_public_test_apk",
|
| + "[BUILDER_CACHE]/android/src/out/Debug/bin/run_chrome_public_test_apk",
|
| "--blacklist-file",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android/src/out/bad_devices.json",
|
| "--verbose",
|
| "--coverage-dir",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/Debug/coverage",
|
| + "[BUILDER_CACHE]/android/src/out/Debug/coverage",
|
| "--json-results-file",
|
| "/path/to/tmp/json",
|
| "--adb-path",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "ChromePublicTest",
|
| "~followup_annotations": [
|
| @@ -698,10 +698,10 @@
|
| "--chrome-revision",
|
| "refs/heads/master@{#170242}"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "Upload to test-results [ChromePublicTest]"
|
| },
|
| @@ -709,21 +709,21 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/Debug/bin/run_content_shell_test_apk",
|
| + "[BUILDER_CACHE]/android/src/out/Debug/bin/run_content_shell_test_apk",
|
| "--blacklist-file",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android/src/out/bad_devices.json",
|
| "--verbose",
|
| "--coverage-dir",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/Debug/coverage",
|
| + "[BUILDER_CACHE]/android/src/out/Debug/coverage",
|
| "--json-results-file",
|
| "/path/to/tmp/json",
|
| "--adb-path",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "ContentShellTest",
|
| "~followup_annotations": [
|
| @@ -752,10 +752,10 @@
|
| "--chrome-revision",
|
| "refs/heads/master@{#170242}"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "Upload to test-results [ContentShellTest]"
|
| },
|
| @@ -763,21 +763,21 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/Debug/bin/run_chrome_sync_shell_test_apk",
|
| + "[BUILDER_CACHE]/android/src/out/Debug/bin/run_chrome_sync_shell_test_apk",
|
| "--blacklist-file",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android/src/out/bad_devices.json",
|
| "--verbose",
|
| "--coverage-dir",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/Debug/coverage",
|
| + "[BUILDER_CACHE]/android/src/out/Debug/coverage",
|
| "--json-results-file",
|
| "/path/to/tmp/json",
|
| "--adb-path",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "ChromeSyncShellTest",
|
| "~followup_annotations": [
|
| @@ -806,10 +806,10 @@
|
| "--chrome-revision",
|
| "refs/heads/master@{#170242}"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "Upload to test-results [ChromeSyncShellTest]"
|
| },
|
| @@ -817,19 +817,19 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android/generate_emma_html.py",
|
| + "[BUILDER_CACHE]/android/src/build/android/generate_emma_html.py",
|
| "--coverage-dir",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/Debug/coverage",
|
| + "[BUILDER_CACHE]/android/src/out/Debug/coverage",
|
| "--metadata-dir",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/Debug",
|
| + "[BUILDER_CACHE]/android/src/out/Debug",
|
| "--cleanup",
|
| "--output",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/Debug/coverage/coverage_html/index.html"
|
| + "[BUILDER_CACHE]/android/src/out/Debug/coverage/coverage_html/index.html"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "Generate coverage report"
|
| },
|
| @@ -842,10 +842,10 @@
|
| "--diff-filter",
|
| "A"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_/src",
|
| + "cwd": "[BUILDER_CACHE]/android/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "Finding changed files matching diff filter: A",
|
| "stdout": "/path/to/tmp/"
|
| @@ -858,10 +858,10 @@
|
| "fake/file1.java",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "Finding lines changed in added file fake/file1.java"
|
| },
|
| @@ -873,10 +873,10 @@
|
| "fake/file2.java;",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "Finding lines changed in added file fake/file2.java;"
|
| },
|
| @@ -888,10 +888,10 @@
|
| "fake/file3.java",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "Finding lines changed in added file fake/file3.java"
|
| },
|
| @@ -904,10 +904,10 @@
|
| "--diff-filter",
|
| "M"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_/src",
|
| + "cwd": "[BUILDER_CACHE]/android/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "Finding changed files matching diff filter: M",
|
| "stdout": "/path/to/tmp/"
|
| @@ -920,10 +920,10 @@
|
| "-s",
|
| "fake/file1.java"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_/src",
|
| + "cwd": "[BUILDER_CACHE]/android/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "Finding lines changed in modified file fake/file1.java",
|
| "stdout": "/path/to/tmp/"
|
| @@ -936,10 +936,10 @@
|
| "-s",
|
| "fake/file2.java;"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_/src",
|
| + "cwd": "[BUILDER_CACHE]/android/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "Finding lines changed in modified file fake/file2.java;",
|
| "stdout": "/path/to/tmp/"
|
| @@ -952,10 +952,10 @@
|
| "-s",
|
| "fake/file3.java"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_/src",
|
| + "cwd": "[BUILDER_CACHE]/android/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "Finding lines changed in modified file fake/file3.java",
|
| "stdout": "/path/to/tmp/"
|
| @@ -968,10 +968,10 @@
|
| "{\"fake/file1.java\": [], \"fake/file2.java;\": [], \"fake/file3.java\": []}",
|
| "[TMP_BASE]/coverage_tmp_1/file_changes.json"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "Saving changed lines for revision."
|
| },
|
| @@ -984,14 +984,14 @@
|
| "--out",
|
| "/path/to/tmp/json",
|
| "--emma-dir",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/Debug/coverage/coverage_html",
|
| + "[BUILDER_CACHE]/android/src/out/Debug/coverage/coverage_html",
|
| "--lines-for-coverage",
|
| "[TMP_BASE]/coverage_tmp_1/file_changes.json"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_/src",
|
| + "cwd": "[BUILDER_CACHE]/android/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "Incremental coverage report",
|
| "~followup_annotations": [
|
| @@ -1040,10 +1040,10 @@
|
| "--pid-file-path",
|
| "/tmp/device_monitor.pid"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "shutdown_device_monitor"
|
| },
|
| @@ -1051,15 +1051,15 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android/adb_logcat_printer.py",
|
| + "[BUILDER_CACHE]/android/src/build/android/adb_logcat_printer.py",
|
| "--output-path",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/Debug/full_log",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/logcat"
|
| + "[BUILDER_CACHE]/android/src/out/Debug/full_log",
|
| + "[BUILDER_CACHE]/android/src/out/logcat"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "logcat_dump"
|
| },
|
| @@ -1076,13 +1076,13 @@
|
| "GSUtil:parallel_composite_upload_threshold=50M",
|
| "----",
|
| "cp",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/Debug/full_log",
|
| + "[BUILDER_CACHE]/android/src/out/Debug/full_log",
|
| "gs://chromium-android/logcat_dumps/Android Coverage (dbg)/571"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "gsutil upload",
|
| "~followup_annotations": [
|
| @@ -1091,17 +1091,17 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_platform/development/scripts/stack",
|
| + "[BUILDER_CACHE]/android/src/third_party/android_platform/development/scripts/stack",
|
| "--arch",
|
| "arm",
|
| "--more-info",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/Debug/full_log"
|
| + "[BUILDER_CACHE]/android/src/out/Debug/full_log"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/Debug",
|
| + "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/android/src/out/Debug",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "stack_tool_with_logcat_dump"
|
| },
|
| @@ -1110,28 +1110,28 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/chrome/VERSION",
|
| + "[BUILDER_CACHE]/android/src/chrome/VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "get version"
|
| },
|
| {
|
| "cmd": [
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android/tombstones.py",
|
| + "[BUILDER_CACHE]/android/src/build/android/tombstones.py",
|
| "-a",
|
| "-s",
|
| "-w"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/Debug",
|
| + "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/android/src/out/Debug",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "stack_tool_for_tombstones"
|
| },
|
| @@ -1140,12 +1140,12 @@
|
| "python",
|
| "-u",
|
| "\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with open(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(report)\n",
|
| - "[BUILDER_CACHE]/Android_Coverage__dbg_/src/out/Debug/test_logs/*.log"
|
| + "[BUILDER_CACHE]/android/src/out/Debug/test_logs/*.log"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Coverage__dbg_",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Coverage__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Coverage__dbg_/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
|
| },
|
| "name": "test_report",
|
| "~followup_annotations": [
|
|
|