From f35bcea85ccfefe9324dcb80e110f843a1f8b5bb Mon Sep 17 00:00:00 2001 From: "jshin@chromium.org" Date: Wed, 4 Dec 2013 04:37:06 +0000 Subject: Move the logic for getting icu data out of icu_util Currently, how to build/link the icu data is split between common.gypi and icu_util.cc Move it out of icu_util.cc and put it in common.gypi Also, remove icudata from the dependency list in url.gyp. icuuc depends on icudata and specifying icuuc alone is sufficient. Otherwise, ninja complains about multiple rules specified for icudata and a circular dependency when icu_use_data_file_flag is set to 1 on Linux. A similar change has to be made in third_party/WebKit/Source/web/web.gyp. (see https://codereview.chromium.org/93053003/ ) This CL does not change the actual build process, yet. It's just to prepare to switch to "icu*.dat" on Mac and Linux. BUG=72633 TEST=All the configuration/builds go fine on all platforms. Review URL: https://codereview.chromium.org/89863002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238567 0039d316-1c4b-4281-b951-d872f2087c98 --- url/url.gyp | 1 - 1 file changed, 1 deletion(-) (limited to 'url/url.gyp') diff --git a/url/url.gyp b/url/url.gyp index 9dc949a..d57c476 100644 --- a/url/url.gyp +++ b/url/url.gyp @@ -16,7 +16,6 @@ 'dependencies': [ '../base/base.gyp:base', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../third_party/icu/icu.gyp:icudata', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', ], -- cgit v1.1