summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorwangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-14 09:38:11 +0000
committerwangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-14 09:38:11 +0000
commit1ba346dd63e728e508be1e84aa234c53c7d6e1d3 (patch)
tree5db3f66d4f78f4561864041d3616b8567f79c8d5 /third_party
parent848a5982930888dedf7a89cda7ceefb40e873b71 (diff)
downloadchromium_src-1ba346dd63e728e508be1e84aa234c53c7d6e1d3.zip
chromium_src-1ba346dd63e728e508be1e84aa234c53c7d6e1d3.tar.gz
chromium_src-1ba346dd63e728e508be1e84aa234c53c7d6e1d3.tar.bz2
Remove extra settings of depending modules from libphonenumber.gyp.
They would conflict with system icu include dirs if use_system_icu=1. Should automatically use direct_dependent_settings in icu.gyp. Also removed explicit include_dirs for protobuf. BUG=85509 Review URL: http://codereview.chromium.org/7003081 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/libphonenumber/libphonenumber.gyp13
1 files changed, 0 insertions, 13 deletions
diff --git a/third_party/libphonenumber/libphonenumber.gyp b/third_party/libphonenumber/libphonenumber.gyp
index c0e26b6..d48d47b 100644
--- a/third_party/libphonenumber/libphonenumber.gyp
+++ b/third_party/libphonenumber/libphonenumber.gyp
@@ -13,19 +13,6 @@
# main chrome tree as well.
'cpp/src',
'<(protoc_out_dir)',
- '../protobuf/src',
- '../icu/public/common',
- '../icu/public/i18n',
- ],
- 'defines': [
- 'U_USING_ICU_NAMESPACE=0',
- ],
- 'conditions': [
- ['OS!="win" or component=="static_library"', {
- 'defines': [
- 'U_STATIC_IMPLEMENTATION',
- ],
- }],
],
},
'targets': [{