scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-linux.intel.32.json - Issue 25792002: Turn off ash and aura by default on linux blink bots.

Side by Side Diff: scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-linux.intel.32.json

Issue 25792002: Turn off ash and aura by default on linux blink bots. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build

Patch Set: merge to r226807 Created 7 years, 2 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 | Annotate | Revision Log

« no previous file with comments | « scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-linux.arm.64.json ('k') | scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-linux.intel.64.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 "android_defaults": {	2 "android_defaults": {

3 "build_config_fs": "Release",	3 "build_config_fs": "Release",

4 "build_dir": "Path('[CHECKOUT]', 'out')",	4 "build_dir": "Path('[CHECKOUT]', 'out')",

5 "compile_py": {	5 "compile_py": {

6 "build_tool": "ninja",	6 "build_tool": "ninja",

7 "default_targets": [	7 "default_targets": [

8 "All"	8 "All"

9 ]	9 ]

10 },	10 },

11 "gyp_env": {	11 "gyp_env": {

12 "GYP_CROSSCOMPILE": "1",	12 "GYP_CROSSCOMPILE": "1",

13 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfil e.out') target_arch=arm",	13 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfil e.out') target_arch=arm",

14 "GYP_GENERATORS": "ninja",	14 "GYP_GENERATORS": "ninja",

15 "GYP_GENERATOR_FLAGS": "default_target=All"	15 "GYP_GENERATOR_FLAGS": "default_target=All"

16 }	16 }

17 },	17 },

18 "blink": {	18 "blink": {

19 "build_config_fs": "Release",	19 "build_config_fs": "Release",

20 "build_dir": "Path('[CHECKOUT]', 'out')",	20 "build_dir": "Path('[CHECKOUT]', 'out')",

21 "compile_py": {	21 "compile_py": {

22 "build_tool": "ninja",	22 "build_tool": "ninja",

23 "compiler": "goma",	23 "compiler": "goma",

24 "default_targets": [	24 "default_targets": [

25 "all_webkit"	25 "all_webkit"

26 ]	26 ]

27 },	27 },

28 "gyp_env": {	28 "gyp_env": {

29 "GYP_DEFINES": "component=static_library",	29 "GYP_DEFINES": "component=static_library use_ash=0 use_aura=0",

30 "GYP_GENERATORS": "ninja"	30 "GYP_GENERATORS": "ninja"

31 }	31 }

32 },	32 },

33 "chromium": {	33 "chromium": {

34 "build_config_fs": "Release",	34 "build_config_fs": "Release",

35 "build_dir": "Path('[CHECKOUT]', 'out')",	35 "build_dir": "Path('[CHECKOUT]', 'out')",

36 "compile_py": {	36 "compile_py": {

37 "build_tool": "ninja",	37 "build_tool": "ninja",

38 "compiler": "goma",	38 "compiler": "goma",

39 "default_targets": [	39 "default_targets": [

(...skipping 241 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
281 },	281 },

282 "gyp_env": {	282 "gyp_env": {

283 "GYP_CROSSCOMPILE": "1",	283 "GYP_CROSSCOMPILE": "1",

284 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfil e.out') target_arch=arm",	284 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfil e.out') target_arch=arm",

285 "GYP_GENERATORS": "ninja",	285 "GYP_GENERATORS": "ninja",

286 "GYP_GENERATOR_FLAGS": "default_target=All"	286 "GYP_GENERATOR_FLAGS": "default_target=All"

287 }	287 }

288 },	288 },

289 "xcodebuild": "can not use xcodebuild on \"linux\""	289 "xcodebuild": "can not use xcodebuild on \"linux\""

290 }	290 }

OLD	NEW