| Index: scripts/slave/recipes/art.expected/mips64-emulator-debug__ON__client.art__clobber.json
|
| diff --git a/scripts/slave/recipes/art.expected/mips64-emulator-debug__ON__client.art__clobber.json b/scripts/slave/recipes/art.expected/mips64-emulator-debug__ON__client.art__clobber.json
|
| index b7886b7a3aef65ef9b0ba7ffe91d9d3b4cabc708..7c7f44afcbeaa7aed21f9e6fd5f9e1ea16391b07 100644
|
| --- a/scripts/slave/recipes/art.expected/mips64-emulator-debug__ON__client.art__clobber.json
|
| +++ b/scripts/slave/recipes/art.expected/mips64-emulator-debug__ON__client.art__clobber.json
|
| @@ -1,22 +1,20 @@
|
| [
|
| {
|
| "cmd": [
|
| - "[DEPOT_TOOLS]/repo",
|
| + "[ROOT]/b/depot_tools/repo",
|
| "init",
|
| "-u",
|
| "https://android.googlesource.com/platform/manifest",
|
| "-b",
|
| "master-art"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "repo init"
|
| },
|
| {
|
| "cmd": [
|
| - "[DEPOT_TOOLS]/repo",
|
| + "[ROOT]/b/depot_tools/repo",
|
| "sync"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "repo sync"
|
| },
|
| {
|
| @@ -24,9 +22,8 @@
|
| "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",
|
| - "[SLAVE_BUILD]/out"
|
| + "[CWD]/out"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree clobber",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -41,14 +38,13 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/art/tools/buildbot-build.sh",
|
| + "[CWD]/art/tools/buildbot-build.sh",
|
| "-j8",
|
| "--target"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
|
| - "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/mips64r6",
|
| + "ANDROID_BUILD_TOP": "[CWD]",
|
| + "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/mips64r6",
|
| "ANDROID_SERIAL": "emulator-5554",
|
| "ART_BUILD_HOST_DEBUG": "false",
|
| "ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
|
| @@ -60,10 +56,10 @@
|
| "ART_TEST_RUN_TEST_2ND_ARCH": "false",
|
| "ART_USE_OPTIMIZING_COMPILER": "true",
|
| "CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker64",
|
| - "JACK_REPOSITORY": "[SLAVE_BUILD]/prebuilts/sdk/tools/jacks",
|
| + "JACK_REPOSITORY": "[CWD]/prebuilts/sdk/tools/jacks",
|
| "JACK_SERVER": "false",
|
| "LEGACY_USE_JAVA7": "true",
|
| - "PATH": "[SLAVE_BUILD]/out/host/linux-x86/bin:%(PATH)s",
|
| + "PATH": "[CWD]/out/host/linux-x86/bin:%(PATH)s",
|
| "TARGET_BUILD_TYPE": "release",
|
| "TARGET_BUILD_VARIANT": "eng",
|
| "TARGET_PRODUCT": "mips64r6",
|
|
|