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 0741fd9b53462090f47d76bde00ec849c2fb5be3..89d265e02a2f2f68e8b502c021dade981af533e2 100644
--- a/third_party/libphonenumber/libphonenumber.gyp
+++ b/third_party/libphonenumber/libphonenumber.gyp
@@ -25,21 +25,20 @@
     '../../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',
-      '../icu/icu.gyp:icuuc',
       '../../base/base.gyp:base',
       '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+      '../icu/icu.gyp:icui18n',
+      '../icu/icu.gyp:icuuc',
+      '../protobuf/protobuf.gyp:protobuf_lite',
     ],
     '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 +46,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,17 +55,17 @@
       'src/resources/phonemetadata.proto',
       'src/resources/phonenumber.proto',
     ],
+    'variables': {
+      'proto_in_dir': 'src/resources',
+      'proto_out_dir': 'third_party/libphonenumber/phonenumbers',
+    },
+    'includes': [ '../../build/protoc.gypi' ],
     'direct_dependent_settings': {
       'include_dirs': [
         '<(SHARED_INTERMEDIATE_DIR)/protoc_out/third_party/libphonenumber',
         'src',
       ],
     },
-    'variables': {
-      'proto_in_dir': 'src/resources',
-      'proto_out_dir': 'third_party/libphonenumber/phonenumbers',
-    },
-    'includes': [ '../../build/protoc.gypi' ],
     'conditions': [
       ['OS=="win"', {
         'action': [
@@ -75,6 +75,23 @@
     ],
   },
   {
+    # Library used by clients that includes production metadata.
+    'target_name': 'libphonenumber',
+    'type': 'static_library',
+    'dependencies': [
+      'libphonenumber_without_metadata',
+    ],
+    'export_dependent_settings': [
+      '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',
+    ],
+  },
+  {
     'target_name': 'libphonenumber_unittests',
     'type': 'executable',
     'sources': [
@@ -96,7 +113,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"', {