commit 79fd822781d0466b4a2537dd7ed069615ddc8b4e
author Android Chromium Automerger <chromium-automerger@android> Thu Aug 28 01:09:34 2014 +0000
committer Android Chromium Automerger <chromium-automerger@android> Thu Aug 28 01:09:34 2014 +0000
tree 7c0cb8580dab3a0597556ee6c038ef6b3ab53773
parent 71fc0d28fe5948db65cf2dd138afd55a1718eaf4
parent 04330715234f76e3de38ad303a57fb07733aad42

Merge third_party/icu from https://chromium.googlesource.com/chromium/deps/icu52.git at 04330715234f76e3de38ad303a57fb07733aad42

This commit was generated by merge_from_chromium.py.

Change-Id: I782588ae97a62e509dbd09b1901f0dc487e73890

icu.gyp

diff --git a/icu.gyp b/icu.gyp
index 770bf9c..910a88a 100644
--- a/icu.gyp
+++ b/icu.gyp
@@ -331,6 +331,19 @@
                 'source/stubdata/stubdata.c',
               ],
             }],
+            [ 'OS == "win" and clang==1', {
+              # Note: General clang warnings should go in the
+              # clang_warning_flags block above.
+              'msvs_settings': {
+                'VCCLCompilerTool': {
+                  'AdditionalOptions': [
+                    # See http://bugs.icu-project.org/trac/ticket/11122
+                    '-Wno-inline-new-delete',
+                    '-Wno-implicit-exception-spec-mismatch',
+                  ],
+                },
+              },
+            }],
             ['OS == "android" and use_system_stlport == 1', {
               'target_conditions': [
                 ['_toolset == "target"', {