| OLD | NEW |
| 1 # | 1 # |
| 2 # Copyright (C) 2011 Google Inc. All rights reserved. | 2 # Copyright (C) 2011 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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 'dependencies': [ | 162 'dependencies': [ |
| 163 '<(DEPTH)/testing/android/native_test.gyp:native_test_na
tive_code', | 163 '<(DEPTH)/testing/android/native_test.gyp:native_test_na
tive_code', |
| 164 '<(DEPTH)/tools/android/forwarder2/forwarder.gyp:forward
er2', | 164 '<(DEPTH)/tools/android/forwarder2/forwarder.gyp:forward
er2', |
| 165 ], | 165 ], |
| 166 }], | 166 }], |
| 167 ['OS=="mac"', { | 167 ['OS=="mac"', { |
| 168 'include_dirs': [ | 168 'include_dirs': [ |
| 169 '../../public/web/mac', | 169 '../../public/web/mac', |
| 170 ], | 170 ], |
| 171 }], | 171 }], |
| 172 [ 'os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and
linux_use_tcmalloc==1', { | 172 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345
554 |
| 173 [ 'os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and
((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocato
r=="see_use_tcmalloc" and linux_use_tcmalloc==1))', { |
| 173 'dependencies': [ | 174 'dependencies': [ |
| 174 '<(DEPTH)/base/allocator/allocator.gyp:allocator', | 175 '<(DEPTH)/base/allocator/allocator.gyp:allocator', |
| 175 ], | 176 ], |
| 176 }], | 177 }], |
| 177 ], | 178 ], |
| 178 } | 179 } |
| 179 ], # targets | 180 ], # targets |
| 180 'conditions': [ | 181 'conditions': [ |
| 181 ['gcc_version>=46', { | 182 ['gcc_version>=46', { |
| 182 'target_defaults': { | 183 'target_defaults': { |
| (...skipping 14 matching lines...) Expand all Loading... |
| 197 ], | 198 ], |
| 198 'variables': { | 199 'variables': { |
| 199 'test_suite_name': 'webkit_unit_tests', | 200 'test_suite_name': 'webkit_unit_tests', |
| 200 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)w
ebkit_unit_tests<(SHARED_LIB_SUFFIX)', | 201 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)w
ebkit_unit_tests<(SHARED_LIB_SUFFIX)', |
| 201 }, | 202 }, |
| 202 'includes': [ '../../../../build/apk_test.gypi' ], | 203 'includes': [ '../../../../build/apk_test.gypi' ], |
| 203 }], | 204 }], |
| 204 }], | 205 }], |
| 205 ], | 206 ], |
| 206 } | 207 } |
| OLD | NEW |