Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'target_defaults': { | 6 'target_defaults': { |
| 7 'variables': { | 7 'variables': { |
| 8 'base_target': 0, | 8 'base_target': 0, |
| 9 }, | 9 }, |
| 10 'target_conditions': [ | 10 'target_conditions': [ |
| (...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 775 ['include', '^threading/platform_thread_linux\\.cc$'], | 775 ['include', '^threading/platform_thread_linux\\.cc$'], |
| 776 ], | 776 ], |
| 777 }], | 777 }], |
| 778 ['OS == "android" and <(android_webview_build)==1', { | 778 ['OS == "android" and <(android_webview_build)==1', { |
| 779 'defines': [ | 779 'defines': [ |
| 780 # WebView builds as part of the system which already has sincos; | 780 # WebView builds as part of the system which already has sincos; |
| 781 # avoid defining it again as it causes a linker warning. | 781 # avoid defining it again as it causes a linker warning. |
| 782 'ANDROID_SINCOS_PROVIDED', | 782 'ANDROID_SINCOS_PROVIDED', |
| 783 ], | 783 ], |
| 784 }], | 784 }], |
| 785 ['OS == "android"', { | |
| 786 'includes': [ | |
| 787 # Pull compiler flags related to low-memory device detection. | |
| 788 '../build/android/low_memory_device.gypi', | |
| 789 ], | |
| 790 }], | |
|
Nico
2013/10/10 16:51:10
I'm not sure we want a dependency from base on bui
digit1
2013/10/11 08:00:12
Yes, that's exactly what happened. For the record,
jar (doing other things)
2013/10/14 19:36:45
I think that usually such "sharing dependencies" a
digit1
2013/10/14 20:01:08
The main issue is that this injection needs to hap
| |
| 785 ['OS == "ios" and _toolset != "host"', { | 791 ['OS == "ios" and _toolset != "host"', { |
| 786 'sources/': [ | 792 'sources/': [ |
| 787 # Pull in specific Mac files for iOS (which have been filtered out | 793 # Pull in specific Mac files for iOS (which have been filtered out |
| 788 # by file name rules). | 794 # by file name rules). |
| 789 ['include', '^atomicops_internals_mac\\.'], | 795 ['include', '^atomicops_internals_mac\\.'], |
| 790 ['include', '^base_paths_mac\\.'], | 796 ['include', '^base_paths_mac\\.'], |
| 791 ['include', '^file_util_mac\\.'], | 797 ['include', '^file_util_mac\\.'], |
| 792 ['include', '^file_version_info_mac\\.'], | 798 ['include', '^file_version_info_mac\\.'], |
| 793 ['include', '^mac/bundle_locations\\.'], | 799 ['include', '^mac/bundle_locations\\.'], |
| 794 ['include', '^mac/foundation_util\\.'], | 800 ['include', '^mac/foundation_util\\.'], |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 915 ['<(toolkit_uses_gtk) == 1', { | 921 ['<(toolkit_uses_gtk) == 1', { |
| 916 'sources!': [ | 922 'sources!': [ |
| 917 'x11/x11_error_tracker.cc', | 923 'x11/x11_error_tracker.cc', |
| 918 ], | 924 ], |
| 919 }], | 925 }], |
| 920 ], | 926 ], |
| 921 }], | 927 }], |
| 922 ], | 928 ], |
| 923 }, | 929 }, |
| 924 } | 930 } |
| OLD | NEW |