| 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 # If you update the default value below, be sure to update the one in | 51 # If you update the default value below, be sure to update the one in |
| 52 # ../config.gyp, too! | 52 # ../config.gyp, too! |
| 53 'enable_oilpan%': 0, | 53 'enable_oilpan%': 1, |
| 54 'detailed_memory_infra%': 0, | 54 'detailed_memory_infra%': 0, |
| 55 'blink_logging_always_on%': 0, | 55 'blink_logging_always_on%': 0, |
| 56 'link_core_modules_separately%': 1, | 56 'link_core_modules_separately%': 1, |
| 57 }, | 57 }, |
| 58 'conditions': [ | 58 'conditions': [ |
| 59 ['use_concatenated_impulse_responses==1', { | 59 ['use_concatenated_impulse_responses==1', { |
| 60 # Use concatenated HRTF impulse responses | 60 # Use concatenated HRTF impulse responses |
| 61 'feature_defines': ['WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1'], | 61 'feature_defines': ['WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1'], |
| 62 }], | 62 }], |
| 63 ['OS!="android"', { | 63 ['OS!="android"', { |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 'feature_defines': [ | 104 'feature_defines': [ |
| 105 'LINK_CORE_MODULES_SEPARATELY', | 105 'LINK_CORE_MODULES_SEPARATELY', |
| 106 ], | 106 ], |
| 107 }], | 107 }], |
| 108 ], | 108 ], |
| 109 | 109 |
| 110 # shared build only. If set to 1, link web, core and modules separately. | 110 # shared build only. If set to 1, link web, core and modules separately. |
| 111 'link_core_modules_separately%': '<(link_core_modules_separately)', | 111 'link_core_modules_separately%': '<(link_core_modules_separately)', |
| 112 }, | 112 }, |
| 113 } | 113 } |
| OLD | NEW |