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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/art.expected/host-x86-ndebug__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
« no previous file with comments | « scripts/slave/recipes/art.expected/host-x86-debug__ON__client.art__noclobber.json ('k') | scripts/slave/recipes/art.expected/host-x86-ndebug__ON__client.art__noclobber.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-ndebug__ON__client.art__clobber.json
diff --git a/scripts/slave/recipes/art.expected/host-x86-ndebug__ON__client.art__clobber.json b/scripts/slave/recipes/art.expected/host-x86-ndebug__ON__client.art__clobber.json
index 14e9e04b13f4c265d467e263f9159a9b36483c49..f622ffebcceeffe9bc09935588fca2190ba1e9df 100644
--- a/scripts/slave/recipes/art.expected/host-x86-ndebug__ON__client.art__clobber.json
+++ b/scripts/slave/recipes/art.expected/host-x86-ndebug__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,12 +41,13 @@
},
{
"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",
@@ -54,10 +58,10 @@
"ART_TEST_RUN_TEST_NDEBUG": "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"
@@ -70,8 +74,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",
@@ -82,10 +87,10 @@
"ART_TEST_RUN_TEST_NDEBUG": "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"
@@ -99,8 +104,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",
@@ -112,10 +118,10 @@
"ART_TEST_RUN_TEST_NDEBUG": "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"
@@ -129,8 +135,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",
@@ -141,10 +148,10 @@
"ART_TEST_RUN_TEST_NDEBUG": "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"
@@ -158,8 +165,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",
@@ -170,10 +178,10 @@
"ART_TEST_RUN_TEST_NDEBUG": "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"
@@ -182,12 +190,13 @@
},
{
"cmd": [
- "[CWD]/art/tools/run-libcore-tests.sh",
+ "[SLAVE_BUILD]/art/tools/run-libcore-tests.sh",
"--mode=host",
"--variant=X32"
],
+ "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",
@@ -198,10 +207,10 @@
"ART_TEST_RUN_TEST_NDEBUG": "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"
@@ -210,12 +219,13 @@
},
{
"cmd": [
- "[CWD]/art/tools/run-jdwp-tests.sh",
+ "[SLAVE_BUILD]/art/tools/run-jdwp-tests.sh",
"--mode=host",
"--variant=X32"
],
+ "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",
@@ -226,10 +236,10 @@
"ART_TEST_RUN_TEST_NDEBUG": "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"
« no previous file with comments | « scripts/slave/recipes/art.expected/host-x86-debug__ON__client.art__noclobber.json ('k') | scripts/slave/recipes/art.expected/host-x86-ndebug__ON__client.art__noclobber.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698