Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Side by Side Diff: Source/build/features.gypi

Issue 1532413002: Added Dartium changes onto 45.0.2454.104 (Closed) Base URL: http://src.chromium.org/blink/branches/chromium/2454
Patch Set: Created 5 years 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 | « Source/bindings/scripts/idl_reader.py ('k') | Source/core/core.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # Copyright (C) 2009 Google Inc. All rights reserved. 2 # Copyright (C) 2009 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 'ENABLE_LAYOUT_UNIT_IN_INLINE_BOXES=0', 42 'ENABLE_LAYOUT_UNIT_IN_INLINE_BOXES=0',
43 # WTF_USE_DYNAMIC_ANNOTATIONS=1 may be defined in build/common.gypi 43 # WTF_USE_DYNAMIC_ANNOTATIONS=1 may be defined in build/common.gypi
44 # We can't define it here because it should be present only 44 # We can't define it here because it should be present only
45 # in Debug or release_valgrind_build=1 builds. 45 # in Debug or release_valgrind_build=1 builds.
46 ], 46 ],
47 # We have to nest variables inside variables so that they can be overridden 47 # We have to nest variables inside variables so that they can be overridden
48 # through GYP_DEFINES. 48 # through GYP_DEFINES.
49 'variables': { 49 'variables': {
50 # Enables the Oilpan garbage-collection infrastructure. 50 # Enables the Oilpan garbage-collection infrastructure.
51 'enable_oilpan%': 0, 51 'enable_oilpan%': 0,
52 'enable_dart%': 1,
52 'blink_gc_profiling%': 0, 53 'blink_gc_profiling%': 0,
53 'blink_logging_always_on%': 0, 54 'blink_logging_always_on%': 0,
54 'link_core_modules_separately%': 1, 55 'link_core_modules_separately%': 1,
55 }, 56 },
57 'enable_dart%': '<(enable_dart)',
56 'conditions': [ 58 'conditions': [
57 ['use_concatenated_impulse_responses==1', { 59 ['use_concatenated_impulse_responses==1', {
58 # Use concatenated HRTF impulse responses 60 # Use concatenated HRTF impulse responses
59 'feature_defines': ['WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1'], 61 'feature_defines': ['WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1'],
60 }], 62 }],
61 ['OS!="android"', { 63 ['OS!="android"', {
62 'feature_defines': [ 64 'feature_defines': [
63 'ENABLE_INPUT_MULTIPLE_FIELDS_UI=1', 65 'ENABLE_INPUT_MULTIPLE_FIELDS_UI=1',
64 'ENABLE_WEB_AUDIO=1' 66 'ENABLE_WEB_AUDIO=1'
65 ], 67 ],
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 ['blink_gc_profiling==1', { 101 ['blink_gc_profiling==1', {
100 'feature_defines': [ 102 'feature_defines': [
101 'ENABLE_GC_PROFILING=1', 103 'ENABLE_GC_PROFILING=1',
102 ], 104 ],
103 }], 105 }],
104 ['blink_logging_always_on==1', { 106 ['blink_logging_always_on==1', {
105 'feature_defines': [ 107 'feature_defines': [
106 'LOG_DISABLED=0', 108 'LOG_DISABLED=0',
107 ], 109 ],
108 }], 110 }],
111 ['enable_dart==1', {
112 'feature_defines': [
113 'ENABLE_DART=1',
114 ],
115 }],
109 ['link_core_modules_separately==1 and component=="shared_library"', { 116 ['link_core_modules_separately==1 and component=="shared_library"', {
110 'feature_defines': [ 117 'feature_defines': [
111 'LINK_CORE_MODULES_SEPARATELY', 118 'LINK_CORE_MODULES_SEPARATELY',
112 ], 119 ],
113 }], 120 }],
114 ], 121 ],
115 122
116 # shared build only. If set to 1, link web, core and modules separately. 123 # shared build only. If set to 1, link web, core and modules separately.
117 'link_core_modules_separately%': '<(link_core_modules_separately)', 124 'link_core_modules_separately%': '<(link_core_modules_separately)',
118 }, 125 },
119 } 126 }
OLDNEW
« no previous file with comments | « Source/bindings/scripts/idl_reader.py ('k') | Source/core/core.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698