| 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 'includes': [ | 6 'includes': [ |
| 7 'icu.gypi', | 7 'icu.gypi', |
| 8 ], | 8 ], |
| 9 'variables': { | 9 'variables': { |
| 10 'use_system_icu%': 0, | 10 'use_system_icu%': 0, |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 }, | 246 }, |
| 247 }], | 247 }], |
| 248 ['OS == "android" and use_system_stlport == 1', { | 248 ['OS == "android" and use_system_stlport == 1', { |
| 249 'target_conditions': [ | 249 'target_conditions': [ |
| 250 ['_toolset == "target"', { | 250 ['_toolset == "target"', { |
| 251 # ICU requires RTTI, which is not present in the system's | 251 # ICU requires RTTI, which is not present in the system's |
| 252 # stlport, so we have to include gabi++. | 252 # stlport, so we have to include gabi++. |
| 253 'include_dirs': [ | 253 'include_dirs': [ |
| 254 '<(android_src)/abi/cpp/include', | 254 '<(android_src)/abi/cpp/include', |
| 255 ], | 255 ], |
| 256 'link_settings': { | |
| 257 'libraries': [ | |
| 258 '-lgabi++', | |
| 259 ], | |
| 260 }, | |
| 261 }], | 256 }], |
| 262 ], | 257 ], |
| 263 }], | 258 }], |
| 264 ], # conditions | 259 ], # conditions |
| 265 }, | 260 }, |
| 266 { | 261 { |
| 267 'target_name': 'icuuc', | 262 'target_name': 'icuuc', |
| 268 'type': '<(component)', | 263 'type': '<(component)', |
| 269 'sources': [ | 264 'sources': [ |
| 270 '<@(icuuc_sources)', | 265 '<@(icuuc_sources)', |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 }, | 353 }, |
| 359 }], | 354 }], |
| 360 ['OS == "android" and use_system_stlport == 1', { | 355 ['OS == "android" and use_system_stlport == 1', { |
| 361 'target_conditions': [ | 356 'target_conditions': [ |
| 362 ['_toolset == "target"', { | 357 ['_toolset == "target"', { |
| 363 # ICU requires RTTI, which is not present in the system's | 358 # ICU requires RTTI, which is not present in the system's |
| 364 # stlport, so we have to include gabi++. | 359 # stlport, so we have to include gabi++. |
| 365 'include_dirs': [ | 360 'include_dirs': [ |
| 366 '<(android_src)/abi/cpp/include', | 361 '<(android_src)/abi/cpp/include', |
| 367 ], | 362 ], |
| 368 'link_settings': { | |
| 369 'libraries': [ | |
| 370 '-lgabi++', | |
| 371 ], | |
| 372 }, | |
| 373 }], | 363 }], |
| 374 ], | 364 ], |
| 375 }], | 365 }], |
| 376 ], # conditions | 366 ], # conditions |
| 377 }, | 367 }, |
| 378 ], # targets | 368 ], # targets |
| 379 }], | 369 }], |
| 380 ['use_system_icu==1', { | 370 ['use_system_icu==1', { |
| 381 'targets': [ | 371 'targets': [ |
| 382 { | 372 { |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 621 }, | 611 }, |
| 622 'includes': [ | 612 'includes': [ |
| 623 '../../build/shim_headers.gypi', | 613 '../../build/shim_headers.gypi', |
| 624 ], | 614 ], |
| 625 'toolsets': ['target'], | 615 'toolsets': ['target'], |
| 626 }, | 616 }, |
| 627 ], # targets | 617 ], # targets |
| 628 }], | 618 }], |
| 629 ], # conditions | 619 ], # conditions |
| 630 } | 620 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 527193003:
Remove invalid link_settings from target condition. (Closed)
Base URL: https://chromium.googlesource.com/chromium/deps/icu52.git@master