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

Unified Diff: scripts/slave/recipes/art.expected/mips64-emulator-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
Index: scripts/slave/recipes/art.expected/mips64-emulator-debug__ON__client.art__noclobber.json
diff --git a/scripts/slave/recipes/art.expected/mips64-emulator-debug__ON__client.art__noclobber.json b/scripts/slave/recipes/art.expected/mips64-emulator-debug__ON__client.art__noclobber.json
index db7731a2edf3f1d51b0e8ef4d0cb71b708cc0196..695546dc1c90597762a3e19e221d21ea949e74d7 100644
--- a/scripts/slave/recipes/art.expected/mips64-emulator-debug__ON__client.art__noclobber.json
+++ b/scripts/slave/recipes/art.expected/mips64-emulator-debug__ON__client.art__noclobber.json
@@ -1,31 +1,34 @@
[
{
"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",
"--target"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "ANDROID_BUILD_TOP": "[CWD]",
- "ANDROID_PRODUCT_OUT": "[CWD]/out/target/product/mips64r6",
+ "ANDROID_BUILD_TOP": "[SLAVE_BUILD]",
+ "ANDROID_PRODUCT_OUT": "[SLAVE_BUILD]/out/target/product/mips64r6",
"ANDROID_SERIAL": "emulator-5554",
"ART_BUILD_HOST_DEBUG": "false",
"ART_TEST_ANDROID_ROOT": "/data/local/tmp/system",
@@ -37,10 +40,10 @@
"ART_TEST_RUN_TEST_2ND_ARCH": "false",
"ART_USE_OPTIMIZING_COMPILER": "true",
"CUSTOM_TARGET_LINKER": "/data/local/tmp/system/bin/linker64",
- "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": "mips64r6",

Powered by Google App Engine
This is Rietveld 408576698