scripts/slave/recipes/android/android_builder.expected/component_builder.json - Issue 23431038: [chromium_android recipes] Cleanup envsetup step and cleanup step names.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 23431038: [chromium_android recipes] Cleanup envsetup step and cleanup step names. (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

« scripts/slave/recipe_modules/chromium_android/api.py ('K') | « scripts/slave/recipes/android/android_builder.expected/clang_builder.json ('k') | scripts/slave/recipes/android/android_builder.expected/klp_builder.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/android/android_builder.expected/component_builder.json

diff --git a/scripts/slave/recipes/android/android_builder.expected/component_builder.json b/scripts/slave/recipes/android/android_builder.expected/component_builder.json

index 01986d142ea53178bf244e946877af86a4006ae2..741347facb690f0361c79bb46433573f4889f6da 100644

--- a/scripts/slave/recipes/android/android_builder.expected/component_builder.json

+++ b/scripts/slave/recipes/android/android_builder.expected/component_builder.json

@@ -47,7 +47,7 @@

"--output-json",

"/path/to/tmp/json"

- "name": "Get AppManifestVars",

+ "name": "get app_manifest_vars",

"~followup_annotations": [

"@@@STEP_LOG_LINE@json.output@{@@@",

"@@@STEP_LOG_LINE@json.output@ \"build_id\": 3333, @@@",

@@ -66,11 +66,13 @@

"[SLAVE_BUILD_ROOT]/src/build/android/envsetup.sh"

"env": {

- "EXTRA_LANDMINES_SCRIPT": "[SLAVE_BUILD_ROOT]/src/repo/build/get_internal_landmines.py"

+ "PATH": "[BUILD_INTERNAL_ROOT]/scripts/slave/android:"

"name": "envsetup",

"~followup_annotations": [

"@@@STEP_LOG_LINE@json.output@{@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"my_new_gyp_def=aaa\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"GYP_SOMETHING\": \"gyp_something_value\", @@@",

"@@@STEP_LOG_LINE@json.output@ \"PATH\": \"./\"@@@",

"@@@STEP_LOG_LINE@json.output@}@@@",

"@@@STEP_LOG_END@json.output@@@"

@@ -107,7 +109,7 @@

"src-internal",

"src/repo"

- "name": "Tree Truth Steps"

+ "name": "tree truth steps"

{

"cmd": [

@@ -117,7 +119,8 @@

"runhooks"

"env": {

- "PATH": "./[BUILD_INTERNAL_ROOT]/scripts/slave/android:./"

+ "EXTRA_LANDMINES_SCRIPT": "[SLAVE_BUILD_ROOT]/src/repo/build/get_internal_landmines.py",

+ "PATH": "[BUILD_INTERNAL_ROOT]/scripts/slave/android:./"

"name": "gclient runhooks"

@@ -140,7 +143,7 @@

"All"

"env": {

- "PATH": "./[BUILD_INTERNAL_ROOT]/scripts/slave/android:./"

+ "PATH": "[BUILD_INTERNAL_ROOT]/scripts/slave/android:./"

"name": "compile"

}