| Index: scripts/slave/recipes/cronet.expected/android_cronet_armv6_builder.json
|
| diff --git a/scripts/slave/recipes/cronet.expected/android_cronet_armv6_builder.json b/scripts/slave/recipes/cronet.expected/android_cronet_armv6_builder.json
|
| index b5c420243f3288dd5c05addd10d71a5bbbb6390b..6e2d76c71cae1e934cf3fe0ec6cbb2301378e050 100644
|
| --- a/scripts/slave/recipes/cronet.expected/android_cronet_armv6_builder.json
|
| +++ b/scripts/slave/recipes/cronet.expected/android_cronet_armv6_builder.json
|
| @@ -6,6 +6,7 @@
|
| "\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]"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "cleanup index.lock",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -44,6 +45,7 @@
|
| "--revision",
|
| "src@4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "bot_update",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -62,6 +64,7 @@
|
| "--spec",
|
| "cache_dir = None\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src'}]\ntarget_os = ['android']"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "gclient setup"
|
| },
|
| {
|
| @@ -79,6 +82,7 @@
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "gclient sync",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -122,6 +126,7 @@
|
| "[SLAVE_BUILD]/src/out/build_product.zip",
|
| "[SLAVE_BUILD]/src"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "clean local files",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -146,6 +151,7 @@
|
| "[DEPOT_TOOLS]/gclient.py",
|
| "runhooks"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GYP_CROSSCOMPILE": "1",
|
| "GYP_DEFINES": "OS=android arm_version=6 component=static_library disable_file_support=1 disable_ftp_support=1 enable_websockets=0 fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1 use_icu_alternatives_on_android=1",
|
| @@ -174,6 +180,7 @@
|
| "cronet_sample_test_apk",
|
| "cronet_test_instrumentation_apk"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -193,6 +200,7 @@
|
| "[SLAVE_BUILD]/src/out/Release/cronet/VERSION",
|
| "gs://chromium-cronet/android/cronet-Release-4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00/VERSION"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil upload_cronet_version",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@Cronet version@https://storage.cloud.google.com/chromium-cronet/android/cronet-Release-4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00/VERSION@@@"
|
| @@ -213,6 +221,7 @@
|
| "[SLAVE_BUILD]/src/out/Release/cronet",
|
| "gs://chromium-cronet/android/cronet-Release-4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil upload_cronet_package",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@Cronet package@https://storage.cloud.google.com/chromium-cronet/android/cronet-Release-4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00@@@"
|
| @@ -225,6 +234,7 @@
|
| "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
|
| "[SLAVE_BUILD]/src/out/logcat"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -238,6 +248,7 @@
|
| "--adb-path",
|
| "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -249,6 +260,7 @@
|
| "--json-output",
|
| "/path/to/tmp/json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -289,6 +301,7 @@
|
| "-t",
|
| "Release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -305,6 +318,7 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -319,6 +333,7 @@
|
| "org.chromium.cronet_sample_apk",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -335,6 +350,7 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Instrumentation test CronetSampleTest"
|
| },
|
| {
|
| @@ -346,6 +362,7 @@
|
| "org.chromium.net",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -362,6 +379,7 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Instrumentation test CronetTestInstrumentation"
|
| },
|
| {
|
| @@ -374,6 +392,7 @@
|
| "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
|
| "[SLAVE_BUILD]/src/out/logcat"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "logcat_dump"
|
| },
|
| {
|
| @@ -384,6 +403,7 @@
|
| "--more-info",
|
| "[SLAVE_BUILD]/src/out/Release/full_log"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -396,6 +416,7 @@
|
| "-s",
|
| "-w"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| @@ -408,6 +429,7 @@
|
| "\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with open(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(report)\n",
|
| "[SLAVE_BUILD]/src/out/Release/test_logs/*.log"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "test_report",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
|
|