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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/android/android_builder.expected/clang_builder.json

Issue 24650004: Fix hack for test presentation in path api. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: rebase Created 7 years, 3 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/recipe_modules/path/api.py ('k') | scripts/slave/recipes/android/android_builder.expected/component_builder.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/android/android_builder.expected/clang_builder.json
diff --git a/scripts/slave/recipes/android/android_builder.expected/clang_builder.json b/scripts/slave/recipes/android/android_builder.expected/clang_builder.json
index b584e0040660df70e5da30f4ed0967b976734f94..176d7c286653c6dee020716d787d662266228be0 100644
--- a/scripts/slave/recipes/android/android_builder.expected/clang_builder.json
+++ b/scripts/slave/recipes/android/android_builder.expected/clang_builder.json
@@ -3,7 +3,7 @@
"cmd": [
"python",
"-u",
- "[DEPOT_TOOLS_ROOT]/gclient.py",
+ "[DEPOT_TOOLS]/gclient.py",
"config",
"--spec",
"cache_dir = None\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/repo', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']"
@@ -19,9 +19,9 @@
"cmd": [
"python",
"-u",
- "[BUILD_ROOT]/scripts/slave/gclient_safe_revert.py",
+ "[BUILD]/scripts/slave/gclient_safe_revert.py",
".",
- "[DEPOT_TOOLS_ROOT]/gclient"
+ "[DEPOT_TOOLS]/gclient"
],
"name": "gclient revert"
},
@@ -29,7 +29,7 @@
"cmd": [
"python",
"-u",
- "[DEPOT_TOOLS_ROOT]/gclient.py",
+ "[DEPOT_TOOLS]/gclient.py",
"sync",
"--nohooks",
"--revision",
@@ -47,11 +47,11 @@
},
{
"cmd": [
- "[SLAVE_BUILD_ROOT]/src/repo/build/dump_app_manifest_vars.py",
+ "[SLAVE_BUILD]/src/repo/build/dump_app_manifest_vars.py",
"-b",
"builder_name",
"-v",
- "[SLAVE_BUILD_ROOT]/src/chrome/VERSION",
+ "[SLAVE_BUILD]/src/chrome/VERSION",
"--output-json",
"/path/to/tmp/json"
],
@@ -68,13 +68,13 @@
},
{
"cmd": [
- "[SLAVE_BUILD_ROOT]/src/build/env_dump.py",
+ "[SLAVE_BUILD]/src/build/env_dump.py",
"--output-json",
"/path/to/tmp/json",
- "[SLAVE_BUILD_ROOT]/src/build/android/envsetup.sh"
+ "[SLAVE_BUILD]/src/build/android/envsetup.sh"
],
"env": {
- "PATH": "[BUILD_INTERNAL_ROOT]/scripts/slave/android:%(PATH)s"
+ "PATH": "[BUILD_INTERNAL]/scripts/slave/android:%(PATH)s"
},
"name": "envsetup",
"~followup_annotations": [
@@ -91,9 +91,9 @@
"python",
"-u",
"\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\nfor base, _dirs, files in os.walk(sys.argv[3]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n",
- "[SLAVE_BUILD_ROOT]/src/out/Debug/debug_info_dumps",
- "[SLAVE_BUILD_ROOT]/src/out/Debug/test_logs",
- "[SLAVE_BUILD_ROOT]/src"
+ "[SLAVE_BUILD]/src/out/Debug/debug_info_dumps",
+ "[SLAVE_BUILD]/src/out/Debug/test_logs",
+ "[SLAVE_BUILD]/src"
],
"name": "clean local files",
"~followup_annotations": [
@@ -111,8 +111,8 @@
{
"allow_subannotations": true,
"cmd": [
- "[SLAVE_BUILD_ROOT]/src/build/tree_truth.sh",
- "[SLAVE_BUILD_ROOT]/src",
+ "[SLAVE_BUILD]/src/build/tree_truth.sh",
+ "[SLAVE_BUILD]/src",
"src",
"src-internal",
"src/repo"
@@ -123,16 +123,16 @@
"cmd": [
"python",
"-u",
- "[DEPOT_TOOLS_ROOT]/gclient.py",
+ "[DEPOT_TOOLS]/gclient.py",
"runhooks"
],
"env": {
- "EXTRA_LANDMINES_SCRIPT": "[SLAVE_BUILD_ROOT]/src/repo/build/get_internal_landmines.py",
+ "EXTRA_LANDMINES_SCRIPT": "[SLAVE_BUILD]/src/repo/build/get_internal_landmines.py",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android app_manifest_version_code=10 app_manifest_version_name=some_builder_1234 chrome_build_id=3333 clang=1 component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=[SLAVE_BUILD_ROOT]/src/orderfiles/orderfile.out target_arch=arm",
+ "GYP_DEFINES": "OS=android app_manifest_version_code=10 app_manifest_version_name=some_builder_1234 chrome_build_id=3333 clang=1 component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=[SLAVE_BUILD]/src/orderfiles/orderfile.out target_arch=arm",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=All",
- "PATH": "[BUILD_INTERNAL_ROOT]/scripts/slave/android:./:%(PATH)s"
+ "PATH": "[BUILD_INTERNAL]/scripts/slave/android:./:%(PATH)s"
},
"name": "gclient runhooks"
},
@@ -141,13 +141,13 @@
"cmd": [
"python",
"-u",
- "[BUILD_ROOT]/scripts/slave/compile.py",
+ "[BUILD]/scripts/slave/compile.py",
"--target",
"Debug",
"--build-dir",
- "[SLAVE_BUILD_ROOT]/src/out",
+ "[SLAVE_BUILD]/src/out",
"--src-dir",
- "[SLAVE_BUILD_ROOT]/src",
+ "[SLAVE_BUILD]/src",
"--build-tool",
"ninja",
"--compiler",
@@ -156,55 +156,55 @@
"All"
],
"env": {
- "PATH": "[BUILD_INTERNAL_ROOT]/scripts/slave/android:./:%(PATH)s"
+ "PATH": "[BUILD_INTERNAL]/scripts/slave/android:./:%(PATH)s"
},
"name": "compile"
},
{
"cmd": [
- "[SLAVE_BUILD_ROOT]/src/build/android/findbugs_diff.py",
+ "[SLAVE_BUILD]/src/build/android/findbugs_diff.py",
"-b",
- "[SLAVE_BUILD_ROOT]/src/repo/bin/findbugs_filter",
+ "[SLAVE_BUILD]/src/repo/bin/findbugs_filter",
"-o",
"com.google.android.apps.chrome.-,org.chromium.-"
],
"env": {
- "PATH": "[BUILD_INTERNAL_ROOT]/scripts/slave/android:./:%(PATH)s"
+ "PATH": "[BUILD_INTERNAL]/scripts/slave/android:./:%(PATH)s"
},
"name": "findbugs internal"
},
{
"cmd": [
- "[SLAVE_BUILD_ROOT]/src/repo/bin/lint.py"
+ "[SLAVE_BUILD]/src/repo/bin/lint.py"
],
"env": {
- "PATH": "[BUILD_INTERNAL_ROOT]/scripts/slave/android:./:%(PATH)s"
+ "PATH": "[BUILD_INTERNAL]/scripts/slave/android:./:%(PATH)s"
},
"name": "lint"
},
{
"cmd": [
- "[SLAVE_BUILD_ROOT]/src/tools/checkdeps/checkdeps.py",
- "--root=[SLAVE_BUILD_ROOT]/src/repo"
+ "[SLAVE_BUILD]/src/tools/checkdeps/checkdeps.py",
+ "--root=[SLAVE_BUILD]/src/repo"
],
"env": {
- "PATH": "[BUILD_INTERNAL_ROOT]/scripts/slave/android:./:%(PATH)s"
+ "PATH": "[BUILD_INTERNAL]/scripts/slave/android:./:%(PATH)s"
},
"name": "checkdeps"
},
{
"cmd": [
- "[SLAVE_BUILD_ROOT]/src/repo/build/upload_build.py",
+ "[SLAVE_BUILD]/src/repo/build/upload_build.py",
"-b",
"builder_name",
"-t",
"Debug",
"-d",
- "[SLAVE_BUILD_ROOT]/src/out",
+ "[SLAVE_BUILD]/src/out",
"-r",
"4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00",
"-g",
- "[BUILD_ROOT]/scripts/slave/gsutil"
+ "[BUILD]/scripts/slave/gsutil"
],
"name": "upload_build"
}
« no previous file with comments | « scripts/slave/recipe_modules/path/api.py ('k') | scripts/slave/recipes/android/android_builder.expected/component_builder.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698