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 'variables': { | 6 'variables': { |
| 7 'use_system_icu%': 0, | 7 'use_system_icu%': 0, |
| 8 'icu_use_data_file_flag%': 0, | 8 'icu_use_data_file_flag%': 0, |
| 9 'want_separate_host_toolset%': 1, | 9 'want_separate_host_toolset%': 1, |
| 10 }, | 10 }, |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 82 }, | 82 }, |
| 83 ], | 83 ], |
| 84 }], | 84 }], |
| 85 [ 'icu_use_data_file_flag', { | 85 [ 'icu_use_data_file_flag', { |
| 86 # Remove any assembly data file. | 86 # Remove any assembly data file. |
| 87 'sources/': [['exclude', 'icudt46l_dat']], | 87 'sources/': [['exclude', 'icudt46l_dat']], |
| 88 # Compile in the stub data symbol. | 88 # Compile in the stub data symbol. |
| 89 'sources': ['source/stubdata/stubdata.c'], | 89 'sources': ['source/stubdata/stubdata.c'], |
| 90 | 90 |
| 91 # Make sure any binary depending on this gets the data file. | 91 # Make sure any binary depending on this gets the data file. |
| 92 'link_settings': { | |
| 93 'conditions': [ | |
| 94 ['OS == "ios"', { | |
| 95 'mac_bundle_resources': [ | |
| 96 'source/data/in/icudtl.dat', | |
| 97 ], | |
| 98 }], | |
| 99 ], | |
| 100 }, # link_settings | |
| 92 'conditions': [ | 101 'conditions': [ |
|
Mark Mentovai
2013/12/18 23:31:29
Why don’t you just make it one conditional with an
| |
| 93 ['OS=="ios"', { | 102 ['OS != "ios"', { |
| 94 'mac_bundle_resources': [ | |
| 95 'source/data/in/icudtl.dat', | |
| 96 ], | |
| 97 }, { | |
| 98 'copies': [{ | 103 'copies': [{ |
| 99 'destination': '<(PRODUCT_DIR)', | 104 'destination': '<(PRODUCT_DIR)', |
| 100 'files': [ | 105 'files': [ |
| 101 'source/data/in/icudtl.dat', | 106 'source/data/in/icudtl.dat', |
| 102 ], | 107 ], |
| 103 }], | 108 }], |
| 104 }], | 109 }], |
| 105 ], # target_conditions | 110 ], # OS != ios |
| 106 }], | 111 }], # icu_use_data_file_flag |
| 107 ], | 112 ], # conditions |
| 108 'target_conditions': [ | 113 'target_conditions': [ |
| 109 [ 'OS == "win" or OS == "mac" or OS == "ios" or ' | 114 [ 'OS == "win" or OS == "mac" or OS == "ios" or ' |
| 110 '(OS == "android" and (_toolset == "target" or host_os != "linux") )', { | 115 '(OS == "android" and (_toolset == "target" or host_os != "linux") )', { |
| 111 'sources!': ['linux/icudt46l_dat.S'], | 116 'sources!': ['linux/icudt46l_dat.S'], |
| 112 }], | 117 }], |
| 113 [ 'OS != "android" or _toolset == "host"', { | 118 [ 'OS != "android" or _toolset == "host"', { |
| 114 'sources!': ['android/icudt46l_dat.S'], | 119 'sources!': ['android/icudt46l_dat.S'], |
| 115 }], | 120 }], |
| 116 [ 'OS != "mac" and OS != "ios" and ' | 121 [ 'OS != "mac" and OS != "ios" and ' |
| 117 '(OS != "android" or _toolset != "host" or host_os != "mac")', { | 122 '(OS != "android" or _toolset != "host" or host_os != "mac")', { |
| (...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 866 'toolsets': ['target'], | 871 'toolsets': ['target'], |
| 867 }, { | 872 }, { |
| 868 'toolsets': ['host', 'target'], | 873 'toolsets': ['host', 'target'], |
| 869 }], | 874 }], |
| 870 ], | 875 ], |
| 871 }, | 876 }, |
| 872 ], | 877 ], |
| 873 }], | 878 }], |
| 874 ], | 879 ], |
| 875 } | 880 } |
| OLD | NEW |