| Index: scripts/slave/recipes/cronet.expected/android_cronet_marshmallow_64bit_perf.json
|
| diff --git a/scripts/slave/recipes/cronet.expected/android_cronet_builder.json b/scripts/slave/recipes/cronet.expected/android_cronet_marshmallow_64bit_perf.json
|
| similarity index 96%
|
| rename from scripts/slave/recipes/cronet.expected/android_cronet_builder.json
|
| rename to scripts/slave/recipes/cronet.expected/android_cronet_marshmallow_64bit_perf.json
|
| index 882f7a0e8451a556c7196671f640cda58a7e5b03..7b309c7ed113516ef7f85a127a9a1b631b2b3325 100644
|
| --- a/scripts/slave/recipes/cronet.expected/android_cronet_builder.json
|
| +++ b/scripts/slave/recipes/cronet.expected/android_cronet_marshmallow_64bit_perf.json
|
| @@ -30,7 +30,7 @@
|
| "--master",
|
| "chromium.testing.master",
|
| "--builder",
|
| - "Android Cronet Builder",
|
| + "Android Cronet Marshmallow 64bit Perf",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -239,7 +239,7 @@
|
| "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_websockets=0 fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=arm use_goma=1 use_platform_icu_alternatives=1",
|
| + "GYP_DEFINES": "OS=android component=static_library disable_brotli_filter=1 disable_file_support=1 disable_ftp_support=1 enable_websockets=0 fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=arm64 use_goma=1 use_platform_icu_alternatives=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"
|
| @@ -253,7 +253,7 @@
|
| "-m",
|
| "chromium.testing.master",
|
| "-b",
|
| - "Android Cronet Builder",
|
| + "Android Cronet Marshmallow 64bit Perf",
|
| "--config-file",
|
| "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| @@ -322,11 +322,11 @@
|
| "Release",
|
| "--no-xvfb",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"master\", \"buildername\": \"Android Cronet Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"src\", \"recipe\": \"cronet\", \"repository\": \"https://chromium.googlesource.com/chromium/src\", \"revision\": \"4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"master\", \"buildername\": \"Android Cronet Marshmallow 64bit Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"src\", \"recipe\": \"cronet\", \"repository\": \"https://chromium.googlesource.com/chromium/src\", \"revision\": \"4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"master\", \"buildername\": \"Android Cronet Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"src\", \"recipe\": \"cronet\", \"repository\": \"https://chromium.googlesource.com/chromium/src\", \"revision\": \"4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"master\", \"buildername\": \"Android Cronet Marshmallow 64bit Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"src\", \"recipe\": \"cronet\", \"repository\": \"https://chromium.googlesource.com/chromium/src\", \"revision\": \"4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--test-type=sizes",
|
| - "--builder-name=Android Cronet Builder",
|
| + "--builder-name=Android Cronet Marshmallow 64bit Perf",
|
| "--slave-name=TestSlavename",
|
| "--build-number=571",
|
| "--run-python-script",
|
| @@ -658,18 +658,18 @@
|
| "----",
|
| "cp",
|
| "[SLAVE_BUILD]/src/out/Release/full_log",
|
| - "gs://chromium-android/logcat_dumps/Android Cronet Builder/571"
|
| + "gs://chromium-android/logcat_dumps/Android Cronet Marshmallow 64bit Perf/571"
|
| ],
|
| "name": "gsutil upload",
|
| "~followup_annotations": [
|
| - "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android Cronet Builder/571@@@"
|
| + "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android Cronet Marshmallow 64bit Perf/571@@@"
|
| ]
|
| },
|
| {
|
| "cmd": [
|
| "[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack",
|
| "--arch",
|
| - "arm",
|
| + "arm64",
|
| "--more-info",
|
| "[SLAVE_BUILD]/src/out/Release/full_log"
|
| ],
|
|
|