Commit 18f43757 authored by mostynb's avatar mostynb Committed by Commit bot

don't mix system and bundled ICU

The ICU 54.1 upgrade added a call to uloc_getDefault() to
base/test/test_suite.cc, but did not add a libicuuc dependency
to the corresponding gyp/gn targets.  This makes it possible to
mix system and bundled ICU headers (and will fail to build if
they differ in version).

BUG=428145

Review URL: https://codereview.chromium.org/943233002

Cr-Commit-Position: refs/heads/master@{#317616}
parent 47a36867
......@@ -876,6 +876,7 @@
'base_i18n',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/libxml/libxml.gyp:libxml',
'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
],
......
......@@ -116,6 +116,7 @@ source_set("test_support") {
"//testing/gmock",
"//testing/gtest",
"//third_party/libxml",
"//third_party/icu:icuuc",
]
if (!is_posix) {
......
......@@ -53,6 +53,7 @@
'../device/usb/usb.gyp:device_usb',
'../ipc/ipc.gyp:ipc',
'../net/net.gyp:net',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/re2/re2.gyp:re2',
'../ui/base/ui_base.gyp:ui_base',
'../ui/gfx/gfx.gyp:gfx_geometry',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment