scripts/slave/recipes/skia/skia.expected/missing_SKP_VERSION_device.json - Issue 1237833003: Update slave scripts to set skia_arch_type but not skia_arch_width

Side by Side Diff: scripts/slave/recipes/skia/skia.expected/missing_SKP_VERSION_device.json

Issue 1237833003: Update slave scripts to set skia_arch_type but not skia_arch_width (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master

Patch Set: rebase Created 5 years, 4 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 unified diff | Download patch

« no previous file with comments | « scripts/slave/recipes/skia/skia.expected/missing_SKIMAGE_VERSION_host.json ('k') | scripts/slave/recipes/skia/skia.expected/missing_SKP_VERSION_host.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 [	1 [

2 {	2 {

3 "cmd": [	3 "cmd": [

4 "git",	4 "git",

5 "fetch"	5 "fetch"

6 ],	6 ],

7 "cwd": "[SLAVE_BUILD]/skia",	7 "cwd": "[SLAVE_BUILD]/skia",

8 "name": "git fetch"	8 "name": "git fetch"

9 },	9 },

10 {	10 {

(...skipping 75 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
86 "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_ninja",	86 "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_ninja",

87 "dm",	87 "dm",

88 "-d",	88 "-d",

89 "nexus_7"	89 "nexus_7"

90 ],	90 ],

91 "cwd": "[SLAVE_BUILD]/skia",	91 "cwd": "[SLAVE_BUILD]/skia",

92 "env": {	92 "env": {

93 "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",	93 "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",

94 "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",	94 "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",

95 "BUILDTYPE": "Debug",	95 "BUILDTYPE": "Debug",

96 "GYP_DEFINES": "skia_arch_type=arm skia_arch_width=32 skia_warnings_as_err ors=0",	96 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",

97 "SKIA_ANDROID_VERBOSE_SETUP": "1",	97 "SKIA_ANDROID_VERBOSE_SETUP": "1",

98 "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm 7-Debug"	98 "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm 7-Debug"

99 },	99 },

100 "name": "build dm"	100 "name": "build dm"

101 },	101 },

102 {	102 {

103 "cmd": [	103 "cmd": [

104 "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_ninja",	104 "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_ninja",

105 "nanobench",	105 "nanobench",

106 "-d",	106 "-d",

107 "nexus_7"	107 "nexus_7"

108 ],	108 ],

109 "cwd": "[SLAVE_BUILD]/skia",	109 "cwd": "[SLAVE_BUILD]/skia",

110 "env": {	110 "env": {

111 "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",	111 "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",

112 "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",	112 "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",

113 "BUILDTYPE": "Debug",	113 "BUILDTYPE": "Debug",

114 "GYP_DEFINES": "skia_arch_type=arm skia_arch_width=32 skia_warnings_as_err ors=0",	114 "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",

115 "SKIA_ANDROID_VERBOSE_SETUP": "1",	115 "SKIA_ANDROID_VERBOSE_SETUP": "1",

116 "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm 7-Debug"	116 "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm 7-Debug"

117 },	117 },

118 "name": "build nanobench"	118 "name": "build nanobench"

119 },	119 },

120 {	120 {

121 "cmd": [	121 "cmd": [

122 "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device",	122 "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device",

123 "-s",	123 "-s",

124 "015d210a13480604"	124 "015d210a13480604"

(...skipping 609 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
734 ],	734 ],

735 "cwd": "[SLAVE_BUILD]",	735 "cwd": "[SLAVE_BUILD]",

736 "env": {	736 "env": {

737 "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",	737 "ANDROID_HOME": "/home/chrome-bot/android-sdk-linux",

738 "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",	738 "ANDROID_SDK_ROOT": "/home/chrome-bot/android-sdk-linux",

739 "SKIA_ANDROID_VERBOSE_SETUP": "1"	739 "SKIA_ANDROID_VERBOSE_SETUP": "1"

740 },	740 },

741 "name": "wait for device (3)"	741 "name": "wait for device (3)"

742 }	742 }

743 ]	743 ]

OLD	NEW