infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Debug-Android_FrameworkDefs.json - Issue 2352653002: GN: remove old Android recipe code.

Side by Side Diff: infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Debug-Android_FrameworkDefs.json

Issue 2352653002: GN: remove old Android recipe code. (Closed)

Patch Set: Created 4 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:

« infra/bots/recipe_modules/flavor/api.py ('K') | « infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot.json ('k') | infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Debug-Android_NoNeon.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
	(Empty)
1 [

2 {

3 "cmd": [

4 "python",

5 "-u",

6 "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os. path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",

7 "[CUSTOM_/_B_WORK]",

8 "511"

9 ],

10 "name": "makedirs checkout_path",

11 "~followup_annotations": [

12 "@@@STEP_LOG_LINE@python.inline@@@@",

13 "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",

14 "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",

15 "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",

16 "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",

17 "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",

18 "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",

19 "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",

20 "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",

21 "@@@STEP_LOG_END@python.inline@@@"

22 ]

23 },

24 {

25 "cmd": [

26 "python",

27 "-u",

28 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",

29 "config",

30 "--spec",

31 "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.gi t'}]"

32 ],

33 "cwd": "[CUSTOM_/_B_WORK]",

34 "env": {

35 "BUILDTYPE": "Debug",

36 "CHROME_HEADLESS": "1",

37 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",

38 "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-Arm7-Debug-Androi d_FrameworkDefs"

39 },

40 "name": "gclient setup"

41 },

42 {

43 "cmd": [

44 "python",

45 "-u",

46 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",

47 "sync",

48 "--verbose",

49 "--with_branch_heads",

50 "--nohooks",

51 "-j8",

52 "--reset",

53 "--force",

54 "--upstream",

55 "--no-nag-max",

56 "--delete_unversioned_trees",

57 "--revision",

58 "skia@abc123",

59 "--output-json",

60 "/path/to/tmp/json"

61 ],

62 "cwd": "[CUSTOM_/_B_WORK]",

63 "env": {

64 "BUILDTYPE": "Debug",

65 "CHROME_HEADLESS": "1",

66 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[dep ot_tools]",

67 "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-Arm7-Debug-Androi d_FrameworkDefs"

68 },

69 "name": "gclient sync",

70 "~followup_annotations": [

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

72 "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",

73 "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@",

74 "@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b 694580e5d17ad10748\"@@@",

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

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

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

78 "@@@STEP_LOG_END@json.output@@@",

79 "@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad1 0748\"@@@"

80 ]

81 },

82 {

83 "cmd": [

84 "python",

85 "-u",

86 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",

87 "recurse",

88 "git",

89 "config",

90 "user.name",

91 "local_bot"

92 ],

93 "cwd": "[CUSTOM_/_B_WORK]",

94 "env": {

95 "BUILDTYPE": "Debug",

96 "CHROME_HEADLESS": "1",

97 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[dep ot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",

98 "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-Arm7-Debug-Androi d_FrameworkDefs"

99 },

100 "name": "gclient recurse (git config user.name)"

101 },

102 {

103 "cmd": [

104 "python",

105 "-u",

106 "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",

107 "recurse",

108 "git",

109 "config",

110 "user.email",

111 "local_bot@example.com"

112 ],

113 "cwd": "[CUSTOM_/_B_WORK]",

114 "env": {

115 "BUILDTYPE": "Debug",

116 "CHROME_HEADLESS": "1",

117 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[dep ot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",

118 "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-Arm7-Debug-Androi d_FrameworkDefs"

119 },

120 "name": "gclient recurse (git config user.email)"

121 },

122 {

123 "cmd": [

124 "which",

125 "adb"

126 ],

127 "name": "which adb",

128 "stdout": "/path/to/tmp/",

129 "~followup_annotations": [

130 "step returned non-zero exit code: 1",

131 "@@@STEP_EXCEPTION@@@"

132 ]

133 },

134 {

135 "cmd": [

136 "python",

137 "-u",

138 "import json\nimport subprocess\nimport sys\n\nccache = None\ntry:\n ccac he = subprocess.check_output(['which', 'ccache']).rstrip()\nexcept:\n pass\npri nt json.dumps({'ccache': ccache})\n"

139 ],

140 "env": {

141 "BUILDTYPE": "Debug",

142 "CHROME_HEADLESS": "1",

143 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[dep ot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",

144 "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-Arm7-Debug-Androi d_FrameworkDefs"

145 },

146 "name": "has ccache?",

147 "stdout": "/path/to/tmp/json",

148 "~followup_annotations": [

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

150 "@@@STEP_LOG_LINE@json.output@ \"ccache\": \"/usr/bin/ccache\"@@@",

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

152 "@@@STEP_LOG_END@json.output@@@",

153 "@@@STEP_LOG_LINE@python.inline@import json@@@",

154 "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",

155 "@@@STEP_LOG_LINE@python.inline@import sys@@@",

156 "@@@STEP_LOG_LINE@python.inline@@@@",

157 "@@@STEP_LOG_LINE@python.inline@ccache = None@@@",

158 "@@@STEP_LOG_LINE@python.inline@try:@@@",

159 "@@@STEP_LOG_LINE@python.inline@ ccache = subprocess.check_output(['which ', 'ccache']).rstrip()@@@",

160 "@@@STEP_LOG_LINE@python.inline@except:@@@",

161 "@@@STEP_LOG_LINE@python.inline@ pass@@@",

162 "@@@STEP_LOG_LINE@python.inline@print json.dumps({'ccache': ccache})@@@",

163 "@@@STEP_LOG_END@python.inline@@@"

164 ]

165 },

166 {

167 "cmd": [

168 "[CUSTOM_/_B_WORK]/skia/platform_tools/android/bin/android_ninja",

169 "most",

170 "-d",

171 "arm_v7_neon",

172 "--gcc"

173 ],

174 "cwd": "[CUSTOM_/_B_WORK]/skia",

175 "env": {

176 "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",

177 "ANDROID_MAKE_CCACHE": "/usr/bin/ccache",

178 "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",

179 "BUILDTYPE": "Debug",

180 "CHROME_HEADLESS": "1",

181 "GYP_DEFINES": "skia_arch_type=arm skia_use_android_framework_defines=1 sk ia_warnings_as_errors=1",

182 "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[dep ot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",

183 "SKIA_ANDROID_VERBOSE_SETUP": "1",

184 "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-Arm7-Debug-Androi d_FrameworkDefs"

185 },

186 "name": "build most"

187 },

188 {

189 "cmd": [

190 "python",

191 "-u",

192 "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get _images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', '* .so', '.dll', '.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell .ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs( dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor patt ern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f i n glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.d irname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",

193 "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-Arm7-Debug-Android_FrameworkD efs/Debug",

194 "[CUSTOM_[SWARM_OUT_DIR]]/out/Debug"

195 ],

196 "name": "copy build products",

197 "~followup_annotations": [

198 "@@@STEP_LOG_LINE@python.inline@import errno@@@",

199 "@@@STEP_LOG_LINE@python.inline@import glob@@@",

200 "@@@STEP_LOG_LINE@python.inline@import os@@@",

201 "@@@STEP_LOG_LINE@python.inline@import shutil@@@",

202 "@@@STEP_LOG_LINE@python.inline@import sys@@@",

203 "@@@STEP_LOG_LINE@python.inline@@@@",

204 "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@",

205 "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@",

206 "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['dm', 'dm.exe' , 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.ex e', '.so', '.dll', '.dylib', 'skia_launcher', 'lib/.so', 'iOSShell.app', 'iO SShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']@@@",

207 "@@@STEP_LOG_LINE@python.inline@@@@",

208 "@@@STEP_LOG_LINE@python.inline@try:@@@",

209 "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@",

210 "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@",

211 "@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@",

212 "@@@STEP_LOG_LINE@python.inline@ raise@@@",

213 "@@@STEP_LOG_LINE@python.inline@@@@",

214 "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@ @",

215 "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@",

216 "@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@",

217 "@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.r elpath(f, src))@@@",

218 "@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(d st_path)):@@@",

219 "@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path ))@@@",

220 "@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@",

221 "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@",

222 "@@@STEP_LOG_END@python.inline@@@"

223 ]

224 },

225 {

226 "name": "$result",

227 "recipe_result": null,

228 "status_code": 0

229 }

230 ]

OLD	NEW