scripts/slave/recipes/android/builder.expected/full_chromium_android_Android_x64_Builder__dbg_.json - Issue 1917243002: Revert "build: roll infra_paths changes"

Unified Diff: scripts/slave/recipes/android/builder.expected/full_chromium_android_Android_x64_Builder__dbg_.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/android/builder.expected/full_chromium_android_Android_MIPS_Builder__dbg_.json ('k') | scripts/slave/recipes/android/builder.expected/full_chromium_android_Android_x86_Builder__dbg_.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/android/builder.expected/full_chromium_android_Android_x64_Builder__dbg_.json

diff --git a/scripts/slave/recipes/android/builder.expected/full_chromium_android_Android_x64_Builder__dbg_.json b/scripts/slave/recipes/android/builder.expected/full_chromium_android_Android_x64_Builder__dbg_.json

index eea5036cb6a97b73fb682fcd011d602bce7dec2f..dbce6b2e52185e40af6ebef7a11552b0dc339835 100644

--- a/scripts/slave/recipes/android/builder.expected/full_chromium_android_Android_x64_Builder__dbg_.json

+++ b/scripts/slave/recipes/android/builder.expected/full_chromium_android_Android_x64_Builder__dbg_.json

@@ -11,13 +11,13 @@

"--slave",

"TestSlavename",

"--spec",

- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['android']",

+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['android']",

"--root",

"src",

"--revision_mapping_file",

"{\"src\": \"got_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]",

"--issue",

"8675309",

"--patchset",

@@ -28,6 +28,7 @@

"src@267739",

"--output_manifest"

+ "cwd": "[SLAVE_BUILD]",

"env": {

"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

@@ -104,11 +105,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/Debug/debug_info_dumps",

- "[CWD]/src/out/Debug/test_logs",

- "[CWD]/src/out/build_product.zip",

- "[CWD]/src"

+ "[SLAVE_BUILD]/src/out/Debug/debug_info_dumps",

+ "[SLAVE_BUILD]/src/out/Debug/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@@@@",

@@ -133,11 +135,12 @@

"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_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[ROOT]/b/build/goma' target_arch=x64 use_goma=1",

- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 use_goma=1",

+ "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"

@@ -145,10 +148,10 @@

"cmd": [

"python",

"-u",

- "[CWD]/src/android_webview/tools/webview_licenses.py",

+ "[SLAVE_BUILD]/src/android_webview/tools/webview_licenses.py",

"scan"

- "cwd": "[CWD]/src",

+ "cwd": "[SLAVE_BUILD]/src",

"name": "check licenses"

{

@@ -166,9 +169,9 @@

"--target",

"Debug",

"--src-dir",

- "[CWD]/src",

+ "[SLAVE_BUILD]/src",

"--goma-cache-dir",

- "[ROOT]/b/build/slave/goma_cache",

+ "[GOMA_CACHE]",

"--build-tool",

"ninja",

"--compiler",

@@ -178,12 +181,13 @@

"--goma-service-account-json-file",

"/creds/service_accounts/service-account-goma-client.json",

"--goma-dir",

- "[ROOT]/b/build/goma",

+ "[BUILD]/goma",

"--"

+ "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",

"~followup_annotations": [