Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # | 1 # |
| 2 # Copyright (C) 2013 Google Inc. All rights reserved. | 2 # Copyright (C) 2013 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 25 matching lines...) Expand all Loading... | |
| 36 'target_name': 'blink_platform_unittests', | 36 'target_name': 'blink_platform_unittests', |
| 37 'type': 'executable', | 37 'type': 'executable', |
| 38 'dependencies': [ | 38 'dependencies': [ |
| 39 'blink_platform.gyp:blink_platform', | 39 'blink_platform.gyp:blink_platform', |
| 40 'blink_platform.gyp:blink_common', | 40 'blink_platform.gyp:blink_common', |
| 41 '../config.gyp:unittest_config', | 41 '../config.gyp:unittest_config', |
| 42 '../wtf/wtf.gyp:wtf', | 42 '../wtf/wtf.gyp:wtf', |
| 43 '../wtf/wtf_tests.gyp:run_all_tests', | 43 '../wtf/wtf_tests.gyp:run_all_tests', |
| 44 '<(DEPTH)/url/url.gyp:url_lib', | 44 '<(DEPTH)/url/url.gyp:url_lib', |
| 45 ], | 45 ], |
| 46 'include_dirs': [ | |
| 47 '<(SHARED_INTERMEDIATE_DIR)/blink', | |
| 48 ], | |
| 46 'sources': [ | 49 'sources': [ |
| 47 '<@(platform_test_files)', | 50 '<@(platform_test_files)', |
| 51 | |
| 52 # Additional .cpp files from platform_derived_sources.gyp:make_platform_de rived_sources actions. | |
| 53 '<(SHARED_INTERMEDIATE_DIR)/blink/RuntimeEnabledFeatures.cpp', | |
| 54 '<(SHARED_INTERMEDIATE_DIR)/blink/RuntimeEnabledFeatures.h', | |
|
abarth-chromium
2013/11/25 18:09:32
This isn't correct. We should pull these in from
| |
| 48 ], | 55 ], |
| 49 'conditions': [ | 56 'conditions': [ |
| 50 ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and linux_use_ tcmalloc==1', { | 57 ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and linux_use_ tcmalloc==1', { |
| 51 'dependencies': [ | 58 'dependencies': [ |
| 52 '<(DEPTH)/base/base.gyp:base', | 59 '<(DEPTH)/base/base.gyp:base', |
| 53 '<(DEPTH)/base/allocator/allocator.gyp:allocator', | 60 '<(DEPTH)/base/allocator/allocator.gyp:allocator', |
| 54 ] | 61 ] |
| 55 }] | 62 }] |
| 56 ] | 63 ] |
| 57 }], | 64 }], |
| 58 } | 65 } |
| OLD | NEW |