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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/art.expected/host-x86-debug__ON__client.art__noclobber.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
« no previous file with comments | « scripts/slave/recipes/art.expected/host-x86-debug__ON__client.art__clobber.json ('k') | scripts/slave/recipes/art.expected/host-x86-ndebug__ON__client.art__clobber.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/art.expected/host-x86-debug__ON__client.art__noclobber.json
diff --git a/scripts/slave/recipes/art.expected/host-x86-debug__ON__client.art__noclobber.json b/scripts/slave/recipes/art.expected/host-x86-debug__ON__client.art__noclobber.json
index fa552dd86e74e2f03218319b2c7fa76ae730f901..b928803874534e4e41825fc88be8fe665f24c183 100644
--- a/scripts/slave/recipes/art.expected/host-x86-debug__ON__client.art__noclobber.json
+++ b/scripts/slave/recipes/art.expected/host-x86-debug__ON__client.art__noclobber.json
@@ -1,30 +1,33 @@
[
{
"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"
},
{
"cmd": [
- "[CWD]/art/tools/buildbot-build.sh",
+ "[SLAVE_BUILD]/art/tools/buildbot-build.sh",
"-j8",
"--host"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
"ART_TEST_FULL": "false",
"ART_TEST_INTERPRETER": "true",
"ART_TEST_JIT": "true",
@@ -33,10 +36,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"HOST_PREFER_32_BIT": "true",
- "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": "sdk"
@@ -49,8 +52,9 @@
"-j8",
"test-art-host-gtest32"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
"ART_TEST_FULL": "false",
"ART_TEST_INTERPRETER": "true",
"ART_TEST_JIT": "true",
@@ -59,10 +63,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"HOST_PREFER_32_BIT": "true",
- "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": "sdk"
@@ -76,8 +80,9 @@
"test-art-host-run-test-optimizing",
"dist"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
"ART_TEST_FULL": "false",
"ART_TEST_INTERPRETER": "true",
"ART_TEST_JIT": "true",
@@ -87,10 +92,10 @@
"ART_TEST_RUN_TEST_DEBUGGABLE": "true",
"ART_USE_OPTIMIZING_COMPILER": "true",
"HOST_PREFER_32_BIT": "true",
- "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": "sdk"
@@ -104,8 +109,9 @@
"test-art-host-run-test-interpreter",
"dist"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
"ART_TEST_FULL": "false",
"ART_TEST_INTERPRETER": "true",
"ART_TEST_JIT": "true",
@@ -114,10 +120,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"HOST_PREFER_32_BIT": "true",
- "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": "sdk"
@@ -131,8 +137,9 @@
"test-art-host-run-test-jit",
"dist"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
"ART_TEST_FULL": "false",
"ART_TEST_INTERPRETER": "true",
"ART_TEST_JIT": "true",
@@ -141,10 +148,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"HOST_PREFER_32_BIT": "true",
- "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": "sdk"
@@ -153,13 +160,14 @@
},
{
"cmd": [
- "[CWD]/art/tools/run-libcore-tests.sh",
+ "[SLAVE_BUILD]/art/tools/run-libcore-tests.sh",
"--mode=host",
"--variant=X32",
"--debug"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
"ART_TEST_FULL": "false",
"ART_TEST_INTERPRETER": "true",
"ART_TEST_JIT": "true",
@@ -168,10 +176,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"HOST_PREFER_32_BIT": "true",
- "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": "sdk"
@@ -180,13 +188,14 @@
},
{
"cmd": [
- "[CWD]/art/tools/run-jdwp-tests.sh",
+ "[SLAVE_BUILD]/art/tools/run-jdwp-tests.sh",
"--mode=host",
"--variant=X32",
"--debug"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
"ART_TEST_FULL": "false",
"ART_TEST_INTERPRETER": "true",
"ART_TEST_JIT": "true",
@@ -195,10 +204,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"HOST_PREFER_32_BIT": "true",
- "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": "sdk"
« no previous file with comments | « scripts/slave/recipes/art.expected/host-x86-debug__ON__client.art__clobber.json ('k') | scripts/slave/recipes/art.expected/host-x86-ndebug__ON__client.art__clobber.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698