Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(907)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/cronet.expected/android_cronet_mips_builder.json

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipes/cronet.expected/android_cronet_data_reduction_proxy_builder.json ('k') | scripts/slave/recipes/cronet.expected/android_cronet_tester.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/cronet.expected/android_cronet_mips_builder.json
diff --git a/scripts/slave/recipes/cronet.expected/android_cronet_mips_builder.json b/scripts/slave/recipes/cronet.expected/android_cronet_mips_builder.json
index 1b75576ec864451a3fe7790ba4b5aab9be065a67..1d89c20b1b6ade0c9c21b6bc80937b4f93913b55 100644
--- a/scripts/slave/recipes/cronet.expected/android_cronet_mips_builder.json
+++ b/scripts/slave/recipes/cronet.expected/android_cronet_mips_builder.json
@@ -4,8 +4,9 @@
"python",
"-u",
"\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files:\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.join(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove(path_to_file)\n",
- "[CWD]"
+ "[SLAVE_BUILD]"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "cleanup index.lock",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -34,13 +35,13 @@
"--slave",
"TestSlavename",
"--spec",
- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src'}]\ntarget_os = ['android']",
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src'}]\ntarget_os = ['android']",
"--root",
"src",
"--revision_mapping_file",
"{\"src\": \"got_src_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
"--git-cache-dir",
- "[ROOT]/b/build/slave/cache_dir",
+ "[GIT_CACHE]",
"--output_json",
"/path/to/tmp/json",
"--revision",
@@ -48,6 +49,7 @@
"--force",
"--output_manifest"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -124,11 +126,12 @@
"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",
- "[CWD]/src/out/Release/debug_info_dumps",
- "[CWD]/src/out/Release/test_logs",
- "[CWD]/src/out/build_product.zip",
- "[CWD]/src"
+ "[SLAVE_BUILD]/src/out/Release/debug_info_dumps",
+ "[SLAVE_BUILD]/src/out/Release/test_logs",
+ "[SLAVE_BUILD]/src/out/build_product.zip",
+ "[SLAVE_BUILD]/src"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "clean local files",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -153,17 +156,19 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
+ "cwd": "[SLAVE_BUILD]",
"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 disable_brotli_filter=1 disable_file_support=1 disable_ftp_support=1 enable_bidirectional_stream=1 enable_websockets=0 fastbuild=1 target_arch=mipsel use_platform_icu_alternatives=1",
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
},
{
"cmd": [],
+ "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma"
},
{
@@ -174,16 +179,17 @@
"--platform",
"linux-amd64",
"--dest-directory",
- "[CWD]/cipd",
+ "[SLAVE_BUILD]/cipd",
"--json-output",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma.install cipd",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"executable\": \"fake_slave_build/cipd\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
@@ -191,10 +197,10 @@
},
{
"cmd": [
- "fake_slave_build/cipd",
+ "[SLAVE_BUILD]/cipd/cipd",
"ensure",
"--root",
- "[ROOT]/b/build/slave/cache/cipd/goma",
+ "[CACHE]/cipd/goma",
"--list",
"infra_internal/goma/client/linux-amd64 release",
"--json-output",
@@ -202,6 +208,7 @@
"--service-account-json",
"/creds/service_accounts/service-account-goma-client.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
@@ -220,18 +227,19 @@
"cmd": [
"python",
"-u",
- "[CWD]/src/tools/mb/mb.py",
+ "[SLAVE_BUILD]/src/tools/mb/mb.py",
"gen",
"-m",
"chromium.testing.master",
"-b",
"Android Cronet MIPS Builder",
"--config-file",
- "[CWD]/src/tools/mb/mb_config.pyl",
+ "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
"--goma-dir",
- "[ROOT]/b/build/slave/cache/cipd/goma",
+ "[CACHE]/cipd/goma",
"//out/Release"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "generate_build_files"
},
{
@@ -249,13 +257,13 @@
"--target",
"Release",
"--src-dir",
- "[CWD]/src",
+ "[SLAVE_BUILD]/src",
"--goma-cache-dir",
- "[ROOT]/b/build/slave/goma_cache",
+ "[GOMA_CACHE]",
"--build-tool",
"ninja",
"--goma-dir",
- "[ROOT]/b/build/slave/cache/cipd/goma",
+ "[CACHE]/cipd/goma",
"--clobber",
"--",
"cronet_package",
@@ -266,9 +274,10 @@
"net_unittests",
"net_unittests_apk"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
"name": "compile"
},
@@ -300,6 +309,7 @@
"--platform",
"android-cronet"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "sizes"
},
{
« no previous file with comments | « scripts/slave/recipes/cronet.expected/android_cronet_data_reduction_proxy_builder.json ('k') | scripts/slave/recipes/cronet.expected/android_cronet_tester.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698