| Index: scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Builder.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Builder.json b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Builder.json
|
| index ef48167d6529df43dab8662e5dacd5d657266820..8243a7699d1389b4e376814d9f091ce3c93ca766 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Builder.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Builder.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_Builder",
|
| + "[BUILDER_CACHE]/android",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -47,7 +47,7 @@
|
| "--force",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Builder",
|
| + "cwd": "[BUILDER_CACHE]/android",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -185,7 +185,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Android_Builder/src/tools/swarming_client/swarming.py",
|
| + "[BUILDER_CACHE]/android/src/tools/swarming_client/swarming.py",
|
| "--version"
|
| ],
|
| "name": "swarming.py --version",
|
| @@ -201,13 +201,13 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Builder/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 fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=arm test_isolation_mode=prepare use_goma=1",
|
| - "PATH": "[BUILDER_CACHE]/Android_Builder/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Builder/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"
|
| },
|
| @@ -215,7 +215,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Android_Builder/src/testing/scripts/get_compile_targets.py",
|
| + "[BUILDER_CACHE]/android/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -223,7 +223,7 @@
|
| "Release",
|
| "--use-src-side-runtest-py",
|
| "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]/Android_Builder/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 Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
|
| ],
|
| @@ -238,12 +238,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/Android_Builder/src/testing/buildbot/chromium.linux.json",
|
| + "[BUILDER_CACHE]/android/src/testing/buildbot/chromium.linux.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec (chromium.linux.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]/Android_Builder/src/testing/buildbot/chromium.linux.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]/android/src/testing/buildbot/chromium.linux.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"Android Tests\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
|
| @@ -275,10 +275,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_Builder/src/out/Release/debug_info_dumps",
|
| - "[BUILDER_CACHE]/Android_Builder/src/out/Release/test_logs",
|
| - "[BUILDER_CACHE]/Android_Builder/src/out/build_product.zip",
|
| - "[BUILDER_CACHE]/Android_Builder/src"
|
| + "[BUILDER_CACHE]/android/src/out/Release/debug_info_dumps",
|
| + "[BUILDER_CACHE]/android/src/out/Release/test_logs",
|
| + "[BUILDER_CACHE]/android/src/out/build_product.zip",
|
| + "[BUILDER_CACHE]/android/src"
|
| ],
|
| "name": "clean local files",
|
| "~followup_annotations": [
|
| @@ -300,8 +300,8 @@
|
| {
|
| "allow_subannotations": false,
|
| "cmd": [
|
| - "[BUILDER_CACHE]/Android_Builder/src/build/tree_truth.sh",
|
| - "[BUILDER_CACHE]/Android_Builder/src",
|
| + "[BUILDER_CACHE]/android/src/build/tree_truth.sh",
|
| + "[BUILDER_CACHE]/android/src",
|
| "src"
|
| ],
|
| "name": "tree truth steps"
|
| @@ -312,7 +312,7 @@
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]/Android_Builder/src/out/Release",
|
| + "[BUILDER_CACHE]/android/src/out/Release",
|
| "--clean-isolated-files"
|
| ],
|
| "name": "clean isolated files"
|
| @@ -321,21 +321,21 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Android_Builder/src/tools/mb/mb.py",
|
| + "[BUILDER_CACHE]/android/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| "chromium.linux",
|
| "-b",
|
| "Android Builder",
|
| "--config-file",
|
| - "[BUILDER_CACHE]/Android_Builder/src/tools/mb/mb_config.pyl",
|
| + "[BUILDER_CACHE]/android/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| "--swarming-targets-file",
|
| "browser_tests_apk\n",
|
| "//out/Release"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Android_Builder/src",
|
| + "cwd": "[BUILDER_CACHE]/android/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -360,7 +360,7 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/Android_Builder/src",
|
| + "[BUILDER_CACHE]/android/src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--goma-deps-cache-dir",
|
| @@ -380,7 +380,7 @@
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Android_Builder/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Builder/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": "compile",
|
| "~followup_annotations": [
|
| @@ -394,9 +394,9 @@
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]/Android_Builder/src/out/Release",
|
| + "[BUILDER_CACHE]/android/src/out/Release",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/Android_Builder/src"
|
| + "[BUILDER_CACHE]/android/src"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "remove_build_metadata"
|
| @@ -406,14 +406,14 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]/resources/isolate.py",
|
| - "[BUILDER_CACHE]/Android_Builder/src/tools/swarming_client",
|
| + "[BUILDER_CACHE]/android/src/tools/swarming_client",
|
| "batcharchive",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--isolate-server",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| - "[BUILDER_CACHE]/Android_Builder/src/out/Release/browser_tests_apk.isolated.gen.json"
|
| + "[BUILDER_CACHE]/android/src/out/Release/browser_tests_apk.isolated.gen.json"
|
| ],
|
| "name": "isolate tests",
|
| "~followup_annotations": [
|
| @@ -439,7 +439,7 @@
|
| "--staging-dir",
|
| "[CACHE]/chrome_staging",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/Android_Builder/src",
|
| + "[BUILDER_CACHE]/android/src",
|
| "--build-url",
|
| "gs://chromium-linux-archive/chromium.linux/Android Builder",
|
| "--build_revision",
|
|
|