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

Unified Diff: scripts/slave/recipes/art.expected/fugu-debug__ON__client.art__clobber.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
Index: scripts/slave/recipes/art.expected/fugu-debug__ON__client.art__clobber.json
diff --git a/scripts/slave/recipes/art.expected/fugu-debug__ON__client.art__clobber.json b/scripts/slave/recipes/art.expected/fugu-debug__ON__client.art__clobber.json
index 04e489d7e3317ea0f9b816136c927f758531a846..a2eb0c17e69ebf206ea5b78e20dc3e9501ebbd11 100644
--- a/scripts/slave/recipes/art.expected/fugu-debug__ON__client.art__clobber.json
+++ b/scripts/slave/recipes/art.expected/fugu-debug__ON__client.art__clobber.json
@@ -1,20 +1,22 @@
[
{
"cmd": [
- "[ROOT]/b/depot_tools/repo",
+ "[DEPOT_TOOLS]/repo",
"init",
"-u",
"https://android.googlesource.com/platform/manifest",
"-b",
"master-art"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "repo init"
},
{
"cmd": [
- "[ROOT]/b/depot_tools/repo",
+ "[DEPOT_TOOLS]/repo",
"sync"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "repo sync"
},
{
@@ -22,8 +24,9 @@
"python",
"-u",
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
- "[CWD]/out"
+ "[SLAVE_BUILD]/out"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "rmtree clobber",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -38,13 +41,14 @@
},
{
"cmd": [
- "[CWD]/art/tools/buildbot-build.sh",
+ "[SLAVE_BUILD]/art/tools/buildbot-build.sh",
"-j8",
"--target"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -56,10 +60,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -69,11 +73,12 @@
},
{
"cmd": [
- "[CWD]/art/tools/setup-buildbot-device.sh"
+ "[SLAVE_BUILD]/art/tools/setup-buildbot-device.sh"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -85,10 +90,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -106,9 +111,10 @@
"/data/art-test",
"/data/nativetest"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -120,10 +126,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -136,9 +142,10 @@
"make",
"test-art-target-sync"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -150,10 +157,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -167,9 +174,10 @@
"-j4",
"test-art-target-gtest32"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -182,10 +190,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -201,9 +209,10 @@
"-v",
"threadtime"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -215,10 +224,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -228,11 +237,12 @@
},
{
"cmd": [
- "[CWD]/art/tools/symbolize-buildbot-crashes.sh"
+ "[SLAVE_BUILD]/art/tools/symbolize-buildbot-crashes.sh"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -244,10 +254,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -261,9 +271,10 @@
"logcat",
"-c"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -275,10 +286,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -293,9 +304,10 @@
"test-art-target-run-test-optimizing",
"dist"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -309,10 +321,10 @@
"ART_TEST_RUN_TEST_DEBUGGABLE": "true",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -328,9 +340,10 @@
"-v",
"threadtime"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -342,10 +355,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -355,11 +368,12 @@
},
{
"cmd": [
- "[CWD]/art/tools/symbolize-buildbot-crashes.sh"
+ "[SLAVE_BUILD]/art/tools/symbolize-buildbot-crashes.sh"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -371,10 +385,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -388,9 +402,10 @@
"logcat",
"-c"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -402,10 +417,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -420,9 +435,10 @@
"test-art-target-run-test-interpreter",
"dist"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -435,10 +451,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -454,9 +470,10 @@
"-v",
"threadtime"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -468,10 +485,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -481,11 +498,12 @@
},
{
"cmd": [
- "[CWD]/art/tools/symbolize-buildbot-crashes.sh"
+ "[SLAVE_BUILD]/art/tools/symbolize-buildbot-crashes.sh"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -497,10 +515,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -514,9 +532,10 @@
"logcat",
"-c"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -528,10 +547,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -546,9 +565,10 @@
"test-art-target-run-test-jit",
"dist"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -561,10 +581,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -580,9 +600,10 @@
"-v",
"threadtime"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -594,10 +615,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -607,11 +628,12 @@
},
{
"cmd": [
- "[CWD]/art/tools/symbolize-buildbot-crashes.sh"
+ "[SLAVE_BUILD]/art/tools/symbolize-buildbot-crashes.sh"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -623,10 +645,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -640,9 +662,10 @@
"logcat",
"-c"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -654,10 +677,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -667,14 +690,15 @@
},
{
"cmd": [
- "[CWD]/art/tools/run-libcore-tests.sh",
+ "[SLAVE_BUILD]/art/tools/run-libcore-tests.sh",
"--mode=device",
"--variant=X32",
"--debug"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -687,10 +711,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -706,9 +730,10 @@
"-v",
"threadtime"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -720,10 +745,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -733,11 +758,12 @@
},
{
"cmd": [
- "[CWD]/art/tools/symbolize-buildbot-crashes.sh"
+ "[SLAVE_BUILD]/art/tools/symbolize-buildbot-crashes.sh"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -749,10 +775,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -766,9 +792,10 @@
"logcat",
"-c"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -780,10 +807,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -793,14 +820,15 @@
},
{
"cmd": [
- "[CWD]/art/tools/run-jdwp-tests.sh",
+ "[SLAVE_BUILD]/art/tools/run-jdwp-tests.sh",
"--mode=device",
"--variant=X32",
"--debug"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -813,10 +841,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -832,9 +860,10 @@
"-v",
"threadtime"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -846,10 +875,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -859,11 +888,12 @@
},
{
"cmd": [
- "[CWD]/art/tools/symbolize-buildbot-crashes.sh"
+ "[SLAVE_BUILD]/art/tools/symbolize-buildbot-crashes.sh"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -875,10 +905,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",
@@ -892,9 +922,10 @@
"logcat",
"-c"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/silvermont",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/silvermont",
"ANDROID_SERIAL": "1FF17015",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -906,10 +937,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker",
- "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
+ "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
"JACK_SERVER": "false",
"LEGACY_USE_JAVA7": "true",
- "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
+ "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
"TARGET_BUILD_TYPE": "release",
"TARGET_BUILD_VARIANT": "eng",
"TARGET_PRODUCT": "silvermont",

Powered by Google App Engine
This is Rietveld 408576698