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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/android/android_builder.expected/arm_builder_rel.json

Issue 296723004: Simplified android_builder and moved internal-only methods to internal module (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Rebase Created 6 years, 7 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/android_builder.expected/arm_builder.json ('k') | scripts/slave/recipes/android/android_builder.expected/clang_builder.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/android/android_builder.expected/arm_builder_rel.json
diff --git a/scripts/slave/recipes/android/android_builder.expected/arm_builder_rel.json b/scripts/slave/recipes/android/android_builder.expected/arm_builder_rel.json
deleted file mode 100644
index 7627c13f01ea3aa88f6b36832451cd8b9a64cef3..0000000000000000000000000000000000000000
--- a/scripts/slave/recipes/android/android_builder.expected/arm_builder_rel.json
+++ /dev/null
@@ -1,268 +0,0 @@
-[
- {
- "cmd": [
- "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",
- "[SLAVE_BUILD]"
- ],
- "name": "cleanup index.lock",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@build_path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(build_path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ for (path, dir, files) in os.walk(build_path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ for cur_file in files:@@@",
- "@@@STEP_LOG_LINE@python.inline@ if cur_file.endswith('index.lock'):@@@",
- "@@@STEP_LOG_LINE@python.inline@ path_to_file = os.path.join(path, cur_file)@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'deleting %s' % path_to_file@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.remove(path_to_file)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "abort_on_failure": true,
- "cmd": [
- "python",
- "-u",
- "[BUILD]/scripts/slave/bot_update.py",
- "--master",
- "chromium.testing.master",
- "--builder",
- "arm_builder_rel",
- "--slave",
- "TestSlavename",
- "--spec",
- "cache_dir = None\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/repo', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']",
- "--revision_mapping_file",
- "{}",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00"
- ],
- "name": "bot_update",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": false@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "[DEPOT_TOOLS]/gclient.py",
- "config",
- "--spec",
- "cache_dir = None\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/repo', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']"
- ],
- "name": "gclient setup"
- },
- {
- "abort_on_failure": true,
- "cmd": [
- "python",
- "-u",
- "[DEPOT_TOOLS]/gclient.py",
- "sync",
- "--nohooks",
- "--delete_unversioned_trees",
- "--force",
- "--verbose",
- "--revision",
- "src/repo@4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00",
- "--output-json",
- "/path/to/tmp/json"
- ],
- "name": "gclient sync",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 170242@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 274981@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/repo/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 126336@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/WebKit/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 124383@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 120644@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarm_client/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 200767@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 276089@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/v8/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 43426@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@274981@@@",
- "@@@SET_BUILD_PROPERTY@got_webkit_revision@124383@@@",
- "@@@SET_BUILD_PROPERTY@got_src_revision@170242@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@120644@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@276089@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision@43426@@@",
- "@@@SET_BUILD_PROPERTY@got_swarm_client_revision@200767@@@"
- ]
- },
- {
- "cmd": [
- "[SLAVE_BUILD]/src/clank/build/dump_app_manifest_vars.py",
- "-b",
- "arm_builder_rel",
- "-v",
- "[SLAVE_BUILD]/src/chrome/VERSION",
- "--output-json",
- "/path/to/tmp/json"
- ],
- "name": "get app_manifest_vars",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"build_id\": 3333, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"date_string\": 6001, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version_code\": 10, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version_name\": \"some_builder_1234\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[SLAVE_BUILD]/src/clank/build/dump_internal_names.py",
- "--output-json",
- "/path/to/tmp/json"
- ],
- "name": "get_internal_names",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"BUILD_BUCKET\": \"build-bucket\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"FLAKINESS_DASHBOARD_SERVER\": \"test-results.appspot.com\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"INSTRUMENTATION_TEST_DATA\": \"a:b/test/data/android/device_files\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"SCREENSHOT_BUCKET\": \"screenshot-archive\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\nfor base, _dirs, files in os.walk(sys.argv[3]):\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"
- ],
- "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@for base, _dirs, files in os.walk(sys.argv[3]):@@@",
- "@@@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",
- "src-internal",
- "src/repo"
- ],
- "name": "tree truth steps"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[DEPOT_TOOLS]/gclient.py",
- "runhooks"
- ],
- "env": {
- "EXTRA_LANDMINES_SCRIPT": "[SLAVE_BUILD]/src/clank/build/get_internal_landmines.py",
- "GYP_DEFINES": "OS=android android_sdk_build_tools_version=19.0.0 android_sdk_root='[SLAVE_BUILD]/src/third_party/android_tools/sdk' android_sdk_version=19 app_manifest_version_code=10 app_manifest_version_name=some_builder_1234 chrome_build_id=3333 component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
- },
- "name": "gclient runhooks"
- },
- {
- "abort_on_failure": true,
- "cmd": [
- "python",
- "-u",
- "[BUILD]/scripts/slave/compile.py",
- "--target",
- "Release",
- "--src-dir",
- "[SLAVE_BUILD]/src",
- "--build-tool",
- "ninja",
- "--compiler",
- "goma",
- "--goma-dir",
- "[BUILD]/goma",
- "--"
- ],
- "env": {
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
- },
- "name": "compile"
- },
- {
- "always_run": true,
- "cmd": [
- "python",
- "-u",
- "[BUILD]/scripts/slave/android/archive_build.py",
- "--target",
- "Release",
- "--name",
- "build_product.zip"
- ],
- "cwd": "[SLAVE_BUILD]/src",
- "name": "zip_build_product"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILD]/scripts/slave/recipe_modules/gsutil/resources/gsutil_wrapper.py",
- "--",
- "[DEPOT_TOOLS]/third_party/gsutil/gsutil",
- "cp",
- "[SLAVE_BUILD]/src/out/build_product.zip",
- "gs://build-bucket/arm_builder_rel/build_product_4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00.zip"
- ],
- "name": "gsutil upload_build_product",
- "~followup_annotations": [
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/build-bucket/arm_builder_rel/build_product_4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00.zip@@@"
- ]
- },
- {
- "always_run": true,
- "cmd": [
- "rm",
- "-rf",
- "[SLAVE_BUILD]/src/out/build_product.zip"
- ],
- "name": "cleanup_build"
- }
-]
« no previous file with comments | « scripts/slave/recipes/android/android_builder.expected/arm_builder.json ('k') | scripts/slave/recipes/android/android_builder.expected/clang_builder.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698