diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 11:14:04 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 11:14:04 +0000 |
| commit | 8bbf61998ab30c1cec463611d16ebf83e3050d02 (patch) | |
| tree | 114a07f1e9a38ccdf4800d18c18a9bd35122c5e3 /url | |
| parent | 5c8f89f69d54d7bafdf1910d620459e0a788c781 (diff) | |
| download | chromium_src-8bbf61998ab30c1cec463611d16ebf83e3050d02.zip chromium_src-8bbf61998ab30c1cec463611d16ebf83e3050d02.tar.gz chromium_src-8bbf61998ab30c1cec463611d16ebf83e3050d02.tar.bz2 | |
Replace third_party/icu/public with third_party/icu/source in the include directives.
This is to move back icu headers in
third_party/icu/public/{i18n,common}/unicode back to their upstream
locations in third_party/icu/source/{i18n,common}/unicode.
http://codereview.chromium.org/18836004 has is a CL to move
ICU header files.
Roll ICU to the version with the above ICU CL (http://crrev.com/211851 ).
In addition to the global replacement of third_party/icu/public with third_party/icu/source, the top-level DEPS, DEPS in printing and chrome/ are tightened up. (the latter two were too permissive (it used to allow any header from third_party/icu).
Besides, sync '-foo' list in ios/public/DEPS with '+foo' in the top-level DEPS and build/linux/unbundled/icu.gyp is updated.
BUG=251433
TEST=Compile succeeds on all bots. checkdeps.py does not find any error.
TBR=brettw,sky,wtc
Review URL: https://chromiumcodereview.appspot.com/18252003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212324 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'url')
| -rw-r--r-- | url/gurl_test_main.cc | 4 | ||||
| -rw-r--r-- | url/url_canon_icu.cc | 6 | ||||
| -rw-r--r-- | url/url_canon_unittest.cc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/url/gurl_test_main.cc b/url/gurl_test_main.cc index 83155fd..d35e5d4 100644 --- a/url/gurl_test_main.cc +++ b/url/gurl_test_main.cc @@ -11,8 +11,8 @@ #include <string> #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/icu/public/common/unicode/putil.h" -#include "third_party/icu/public/common/unicode/udata.h" +#include "third_party/icu/source/common/unicode/putil.h" +#include "third_party/icu/source/common/unicode/udata.h" #define ICU_UTIL_DATA_SHARED 1 #define ICU_UTIL_DATA_STATIC 2 diff --git a/url/url_canon_icu.cc b/url/url_canon_icu.cc index 95e9c13..8d6bdfc 100644 --- a/url/url_canon_icu.cc +++ b/url/url_canon_icu.cc @@ -8,9 +8,9 @@ #include <string.h> #include "base/logging.h" -#include "third_party/icu/public/common/unicode/ucnv.h" -#include "third_party/icu/public/common/unicode/ucnv_cb.h" -#include "third_party/icu/public/common/unicode/uidna.h" +#include "third_party/icu/source/common/unicode/ucnv.h" +#include "third_party/icu/source/common/unicode/ucnv_cb.h" +#include "third_party/icu/source/common/unicode/uidna.h" #include "url/url_canon_icu.h" #include "url/url_canon_internal.h" // for _itoa_s diff --git a/url/url_canon_unittest.cc b/url/url_canon_unittest.cc index 6f52d66..b3c129d 100644 --- a/url/url_canon_unittest.cc +++ b/url/url_canon_unittest.cc @@ -5,7 +5,7 @@ #include <errno.h> #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/icu/public/common/unicode/ucnv.h" +#include "third_party/icu/source/common/unicode/ucnv.h" #include "url/url_canon.h" #include "url/url_canon_icu.h" #include "url/url_canon_internal.h" |