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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_linux_android_dbg_ng.json

Issue 1938603002: [Android] Move Android chromium.linux compile targets into src. (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/chromium_trybot.expected/full_tryserver_chromium_android_android_swarming_rel.json ('k') | scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_linux_android_rel_ng.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_linux_android_dbg_ng.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_linux_android_dbg_ng.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_linux_android_dbg_ng.json
index 175c0875cffa5ee681355fbe380904a07947990a..ba55523faee3bf6fe5820534865c49c9883e012a 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_linux_android_dbg_ng.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_linux_android_dbg_ng.json
@@ -273,18 +273,9 @@
"@@@STEP_LOG_LINE@excluded_files@foo.cc (regex = 'f.*')@@@",
"@@@STEP_LOG_END@excluded_files@@@",
"@@@STEP_LOG_LINE@analyze_details@{@@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"additional_compile_targets\": [@@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"cronet_test_instrumentation_apk\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"system_webview_apk\"@@@",
- "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [@@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"cronet_test_instrumentation_apk\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"system_webview_apk\"@@@",
- "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [@@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"cronet_test_instrumentation_apk\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"system_webview_apk\"@@@",
- "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"additional_compile_targets\": [], @@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [], @@@",
+ "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [], @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.test_targets\": [], @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"test_targets\": []@@@",
"@@@STEP_LOG_LINE@analyze_details@}@@@",
@@ -295,118 +286,6 @@
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
- "cmd": [
- "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",
- "[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"
- ],
- "name": "clean local files",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import shutil, sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1], True)@@@",
- "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[2], True)@@@",
- "@@@STEP_LOG_LINE@python.inline@try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.remove(sys.argv[3])@@@",
- "@@@STEP_LOG_LINE@python.inline@except OSError:@@@",
- "@@@STEP_LOG_LINE@python.inline@ pass@@@",
- "@@@STEP_LOG_LINE@python.inline@for base, _dirs, files in os.walk(sys.argv[4]):@@@",
- "@@@STEP_LOG_LINE@python.inline@ for f in files:@@@",
- "@@@STEP_LOG_LINE@python.inline@ if f.endswith('.pyc'):@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.remove(os.path.join(base, f))@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "allow_subannotations": false,
- "cmd": [
- "[SLAVE_BUILD]/src/build/tree_truth.sh",
- "[SLAVE_BUILD]/src",
- "src"
- ],
- "name": "tree truth steps"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[SLAVE_BUILD]/src/tools/mb/mb.py",
- "gen",
- "-m",
- "tryserver.chromium.android",
- "-b",
- "linux_android_dbg_ng",
- "--config-file",
- "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
- "--goma-dir",
- "[CACHE]/cipd/goma",
- "//out/Debug"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "generate_build_files (with patch)"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
- "--ninja-path",
- "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
- "--target",
- "Debug",
- "--src-dir",
- "[SLAVE_BUILD]/src",
- "--goma-cache-dir",
- "[GOMA_CACHE]",
- "--build-tool",
- "ninja",
- "--compiler",
- "goma",
- "--goma-jsonstatus",
- "/path/to/tmp/json",
- "--goma-service-account-json-file",
- "/creds/service_accounts/service-account-goma-client.json",
- "--goma-dir",
- "[CACHE]/cipd/goma",
- "--goma-fail-fast",
- "--goma-disable-local-fallback",
- "--",
- "cronet_test_instrumentation_apk",
- "system_webview_apk"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
- },
- "name": "compile (with patch)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
- "@@@STEP_LOG_END@json.output (invalid)@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
"import sys; sys.exit(0)"
],
"name": "mark: before_tests"
« no previous file with comments | « scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_swarming_rel.json ('k') | scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_linux_android_rel_ng.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698