| OLD | NEW |
| 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 19 matching lines...) Expand all Loading... |
| 30 | 30 |
| 31 { | 31 { |
| 32 # The following defines turn WebKit features on and off. | 32 # The following defines turn WebKit features on and off. |
| 33 'variables': { | 33 'variables': { |
| 34 'feature_defines': [ | 34 'feature_defines': [ |
| 35 'ENABLE_LAYOUT_UNIT_IN_INLINE_BOXES=0', | 35 'ENABLE_LAYOUT_UNIT_IN_INLINE_BOXES=0', |
| 36 # WTF_USE_DYNAMIC_ANNOTATIONS=1 may be defined in build/common.gypi | 36 # WTF_USE_DYNAMIC_ANNOTATIONS=1 may be defined in build/common.gypi |
| 37 # We can't define it here because it should be present only | 37 # We can't define it here because it should be present only |
| 38 # in Debug or release_valgrind_build=1 builds. | 38 # in Debug or release_valgrind_build=1 builds. |
| 39 ], | 39 ], |
| 40 'public_feature_defines': [ |
| 41 ], |
| 42 |
| 40 # We have to nest variables inside variables so that they can be overridden | 43 # We have to nest variables inside variables so that they can be overridden |
| 41 # through GYP_DEFINES. | 44 # through GYP_DEFINES. |
| 42 'variables': { | 45 'variables': { |
| 43 # Enables the Oilpan garbage-collection infrastructure. | 46 # Enables the Oilpan garbage-collection infrastructure. |
| 44 'enable_oilpan%': 0, | 47 'enable_oilpan%': 0, |
| 45 'gc_profile_heap%': 0, | 48 'gc_profile_heap%': 0, |
| 46 'gc_profile_marking%': 0, | 49 'gc_profile_marking%': 0, |
| 47 'blink_logging_always_on%': 0, | 50 'blink_logging_always_on%': 0, |
| 48 }, | 51 }, |
| 49 'conditions': [ | 52 'conditions': [ |
| (...skipping 20 matching lines...) Expand all Loading... |
| 70 # allow most WebAudio features to work on Android. | 73 # allow most WebAudio features to work on Android. |
| 71 'ENABLE_WEB_AUDIO=1', | 74 'ENABLE_WEB_AUDIO=1', |
| 72 ], | 75 ], |
| 73 }], | 76 }], |
| 74 ['use_default_render_theme==1', { | 77 ['use_default_render_theme==1', { |
| 75 'feature_defines': [ | 78 'feature_defines': [ |
| 76 'WTF_USE_DEFAULT_RENDER_THEME=1', | 79 'WTF_USE_DEFAULT_RENDER_THEME=1', |
| 77 ], | 80 ], |
| 78 }], | 81 }], |
| 79 ['enable_oilpan==1', { | 82 ['enable_oilpan==1', { |
| 80 'feature_defines': [ | 83 'public_feature_defines': [ |
| 81 'ENABLE_OILPAN=1', | 84 'ENABLE_OILPAN=1', |
| 82 ], | 85 ], |
| 83 }], | 86 }], |
| 84 ['gc_profile_heap==1', { | 87 ['gc_profile_heap==1', { |
| 85 'feature_defines': [ | 88 'feature_defines': [ |
| 86 'ENABLE_GC_PROFILING=1', | 89 'ENABLE_GC_PROFILING=1', |
| 87 'ENABLE_GC_PROFILE_HEAP=1', | 90 'ENABLE_GC_PROFILE_HEAP=1', |
| 88 ], | 91 ], |
| 89 }], | 92 }], |
| 90 ['gc_profile_marking==1', { | 93 ['gc_profile_marking==1', { |
| 91 'feature_defines': [ | 94 'feature_defines': [ |
| 92 'ENABLE_GC_PROFILING=1', | 95 'ENABLE_GC_PROFILING=1', |
| 93 'ENABLE_GC_PROFILE_MARKING=1', | 96 'ENABLE_GC_PROFILE_MARKING=1', |
| 94 ], | 97 ], |
| 95 }], | 98 }], |
| 96 ['blink_logging_always_on==1', { | 99 ['blink_logging_always_on==1', { |
| 97 'feature_defines': [ | 100 'feature_defines': [ |
| 98 'LOG_DISABLED=0', | 101 'LOG_DISABLED=0', |
| 99 ], | 102 ], |
| 100 }], | 103 }], |
| 101 ], | 104 ], |
| 105 |
| 106 'feature_defines': [ |
| 107 '<@(public_feature_defines)' |
| 108 ] |
| 102 }, | 109 }, |
| 103 } | 110 } |
| OLD | NEW |