Roll libphonenumber r456

third_party/libphonenumber/libphonenumber.gyp

Index: third_party/libphonenumber/libphonenumber.gyp
diff --git a/third_party/libphonenumber/libphonenumber.gyp b/third_party/libphonenumber/libphonenumber.gyp
index 16f21dc415a07d00592ade9e1c40b527dbc17542..765a876505ebad54e21a4c878ff6a1e300b0918d 100644
--- a/third_party/libphonenumber/libphonenumber.gyp
+++ b/third_party/libphonenumber/libphonenumber.gyp
@@ -25,7 +25,9 @@
     '../../build/win_precompile.gypi',
   ],
   'targets': [{
-    'target_name': 'libphonenumber',
+    # Build a library without metadata so that we can use it with both testing
+    # and production metadata. This library should not be used by clients.
+    'target_name': 'libphonenumber_without_metadata',
     'type': 'static_library',
     'dependencies': [
       '../icu/icu.gyp:icui18n',
@@ -36,10 +38,6 @@
     'sources': [
       'src/phonenumbers/asyoutypeformatter.cc',
       'src/phonenumbers/default_logger.cc',
-      # Comment next line and uncomment the line after, if complete metadata
-      # (with examples) is needed.
-      'src/phonenumbers/lite_metadata.cc',
-      #'src/phonenumbers/metadata.cc',
       'src/phonenumbers/logger.cc',
       'src/phonenumbers/phonenumber.cc',
       'src/phonenumbers/phonenumbermatch.cc',
@@ -47,6 +45,7 @@
       'src/phonenumbers/phonenumberutil.cc',
       'src/phonenumbers/regexp_adapter_icu.cc',
       'src/phonenumbers/regexp_cache.cc',
+      'src/phonenumbers/string_byte_sink.cc',
       'src/phonenumbers/stringutil.cc',
       'src/phonenumbers/unicodestring.cc',
       'src/phonenumbers/utf/rune.c',
@@ -55,11 +54,6 @@
       'src/resources/phonemetadata.proto',
       'src/resources/phonenumber.proto',
     ],
-    'direct_dependent_settings': {
-      'include_dirs': [
-        '<(SHARED_INTERMEDIATE_DIR)/protoc_out/third_party/libphonenumber',
-      ],
-    },
     'variables': {
       'proto_in_dir': 'src/resources',
       'proto_out_dir': 'third_party/libphonenumber/phonenumbers',
@@ -73,6 +67,25 @@
       }],
     ],
   },
+  # Library used by clients that includes production metadata.

[Ilya Sherman, 2012/05/25 19:56:08]

nit: Please move this line immediately above the "target_name", to match the
placement of the comment on lines 28-29.

[Philippe, 2012/05/29 07:47:47]

Done.

+  {
+    'target_name': 'libphonenumber',
+    'type': 'static_library',
+    'dependencies': [
+      'libphonenumber_without_metadata',
+    ],
+    'sources': [
+      # Comment next line and uncomment the line after, if complete metadata
+      # (with examples) is needed.
+      'src/phonenumbers/lite_metadata.cc',
+      #'src/phonenumbers/metadata.cc',
+    ],
+    'direct_dependent_settings': {
+      'include_dirs': [
+        '<(SHARED_INTERMEDIATE_DIR)/protoc_out/third_party/libphonenumber',
+      ],
+    },
+  },
   {
     'target_name': 'libphonenumber_unittests',
     'type': 'executable',
@@ -95,7 +108,7 @@
       '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
       '../../testing/gmock.gyp:gmock',
       '../../testing/gtest.gyp:gtest',
-      'libphonenumber',
+      'libphonenumber_without_metadata',
     ],
     'conditions': [
       ['OS=="win"', {