scripts/slave/recipes/dart/dartium_android_builder.py - Issue 1917243002: Revert "build: roll infra_paths changes"

Side by Side Diff: scripts/slave/recipes/dart/dartium_android_builder.py

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, 7 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/dart/dart_vm.expected/vm-linux-release-x64-asan-be.json ('k') | scripts/slave/recipes/dart/dartium_android_builder.expected/dartium_builder_basic.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 # Copyright 2014 The Chromium Authors. All rights reserved.	1 # Copyright 2014 The Chromium Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4	4

5 DEPS = [	5 DEPS = [

6 'chromium',	6 'chromium',

7 'chromium_android',	7 'chromium_android',

8 'depot_tools/gclient',	8 'depot_tools/gclient',

9 'depot_tools/infra_paths',

10 'recipe_engine/json',	9 'recipe_engine/json',

11 'recipe_engine/path',	10 'recipe_engine/path',

12 'recipe_engine/properties',	11 'recipe_engine/properties',

13 'recipe_engine/python',	12 'recipe_engine/python',

14 ]	13 ]

15	14

16 def RunSteps(api):	15 def RunSteps(api):

17 recipe_config = 'dartium_builder'	16 recipe_config = 'dartium_builder'

18 kwargs = {	17 kwargs = {

19 'REPO_URL': api.properties.get('deps_url'),	18 'REPO_URL': api.properties.get('deps_url'),

(...skipping 10 matching lines...) Expand all Loading...
30 api.chromium_android.c.revisions['src/dart'] = revision	29 api.chromium_android.c.revisions['src/dart'] = revision

31	30

32 api.chromium_android.init_and_sync(use_bot_update=False)	31 api.chromium_android.init_and_sync(use_bot_update=False)

33 # TODO(iannucci): Remove when dartium syncs chromium to >= crrev.com/252649	32 # TODO(iannucci): Remove when dartium syncs chromium to >= crrev.com/252649

34 api.chromium.runhooks(env={'GYP_CROSSCOMPILE': "1"})	33 api.chromium.runhooks(env={'GYP_CROSSCOMPILE': "1"})

35 api.chromium.compile(targets=['content_shell_apk'])	34 api.chromium.compile(targets=['content_shell_apk'])

36	35

37 build_products_dir = \	36 build_products_dir = \

38 api.chromium.c.build_dir.join(api.chromium.c.build_config_fs)	37 api.chromium.c.build_dir.join(api.chromium.c.build_config_fs)

39 api.python('dartium_test',	38 api.python('dartium_test',

40 api.infra_paths['slave_build'].join('src', 'dart', 'tools',	39 api.path['slave_build'].join('src', 'dart', 'tools',

41 'bots', 'dartium_android.py'),	40 'bots', 'dartium_android.py'),

42 args=['--build-products-dir', build_products_dir])	41 args=['--build-products-dir', build_products_dir])

43	42

44 def GenTests(api):	43 def GenTests(api):

45 yield (	44 yield (

46 api.test('dartium_builder_basic') +	45 api.test('dartium_builder_basic') +

47 api.properties.generic(	46 api.properties.generic(

48 revision='34567',	47 revision='34567',

49 buildername='dartium-builder',	48 buildername='dartium-builder',

50 buildnumber=1337,	49 buildnumber=1337,

51 deps_url='https://dart.googlecode.com/svn/trunk/deps/dartium.deps',	50 deps_url='https://dart.googlecode.com/svn/trunk/deps/dartium.deps',

52 deps_path='dartium.deps'))	51 deps_path='dartium.deps'))

53 yield (	52 yield (

54 api.test('dartium_builder_git') +	53 api.test('dartium_builder_git') +

55 api.properties.generic(	54 api.properties.generic(

56 revision='478695f60c28b5b8a951ce1d4fd60f53d80b21fb',	55 revision='478695f60c28b5b8a951ce1d4fd60f53d80b21fb',

57 buildername='dartium-builder',	56 buildername='dartium-builder',

58 buildnumber=1337,	57 buildnumber=1337,

59 deps_url='https://github.com/dart-lang/sdk.git',	58 deps_url='https://github.com/dart-lang/sdk.git',

60 deps_path='src/dart'))	59 deps_path='src/dart'))

OLD	NEW