[libphonenumber] Change DEPS to track new github mirror, uprev library

third_party/libphonenumber/libphonenumber.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'target_defaults': {
     'include_dirs': [
-      'src',
-      'src/test',
+      'src/cpp/src',
+      'src/cpp/test',
       # The libphonenumber source (and test code) expects the
       # generated protocol headers to be available with "phonenumbers" include
       # path, e.g. #include "phonenumbers/foo.pb.h".
       '<(SHARED_INTERMEDIATE_DIR)/protoc_out/third_party/libphonenumber',
     ],
     'defines': [
       'I18N_PHONENUMBERS_USE_ICU_REGEXP=1',
     ],
     'conditions': [
       # libphonenumber can only be thread-safe on POSIX platforms. This is ok
@@ skipping 17 matching lines @@
     # and production metadata. This library should not be used by clients.
     # GN version: //third_party/libphonenumber:libphonenumber_without_metadata
     'target_name': 'libphonenumber_without_metadata',
     'type': 'static_library',
     'dependencies': [
       '../icu/icu.gyp:icui18n',
       '../icu/icu.gyp:icuuc',
       '../protobuf/protobuf.gyp:protobuf_lite',
     ],
     'sources': [
-      'src/phonenumbers/asyoutypeformatter.cc',
-      'src/phonenumbers/base/strings/string_piece.cc',
-      'src/phonenumbers/default_logger.cc',
-      'src/phonenumbers/logger.cc',
-      'src/phonenumbers/phonenumber.cc',
-      'src/phonenumbers/phonenumbermatch.cc',
-      'src/phonenumbers/phonenumbermatcher.cc',
-      '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',
-      'src/phonenumbers/utf/unicodetext.cc',
-      'src/phonenumbers/utf/unilib.cc',
+      'src/cpp/src/phonenumbers/asyoutypeformatter.cc',
+      'src/cpp/src/phonenumbers/base/strings/string_piece.cc',
+      'src/cpp/src/phonenumbers/default_logger.cc',
+      'src/cpp/src/phonenumbers/logger.cc',
+      'src/cpp/src/phonenumbers/phonenumber.cc',
+      'src/cpp/src/phonenumbers/phonenumbermatch.cc',
+      'src/cpp/src/phonenumbers/phonenumbermatcher.cc',
+      'src/cpp/src/phonenumbers/phonenumberutil.cc',
+      'src/cpp/src/phonenumbers/regexp_adapter_icu.cc',
+      'src/cpp/src/phonenumbers/regexp_cache.cc',
+      'src/cpp/src/phonenumbers/string_byte_sink.cc',
+      'src/cpp/src/phonenumbers/stringutil.cc',
+      'src/cpp/src/phonenumbers/unicodestring.cc',
+      'src/cpp/src/phonenumbers/utf/rune.c',
+      'src/cpp/src/phonenumbers/utf/unicodetext.cc',
+      'src/cpp/src/phonenumbers/utf/unilib.cc',
       'src/resources/phonemetadata.proto',
       'src/resources/phonenumber.proto',
     ],
     'variables': {
       'proto_in_dir': 'src/resources',
       'proto_out_dir': 'third_party/libphonenumber/phonenumbers',
       'clang_warning_flags': [
         # https://github.com/googlei18n/libphonenumber/pull/741
         '-Wno-unused-private-field',
       ],
     },
     'includes': [ '../../build/protoc.gypi' ],
     'direct_dependent_settings': {
       'include_dirs': [
         '<(SHARED_INTERMEDIATE_DIR)/protoc_out/third_party/libphonenumber',
-        'src',
+        'src/cpp/src',
       ],
       'defines': [
         'I18N_PHONENUMBERS_USE_ICU_REGEXP=1',
       ],
       'conditions': [
         ['OS != "android"', {
           'defines': [
             'I18N_PHONENUMBERS_NO_THREAD_SAFETY=1',
           ],
         }],
@@ skipping 14 matching lines @@
     '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',
+      'src/cpp/src/phonenumbers/lite_metadata.cc',
+      #'src/cpp/src/phonenumbers/metadata.cc',
     ],
   },
   {
     # GN version: //third_party/libphonenumber:libphonenumber_unittests
     'target_name': 'libphonenumber_unittests',
     'type': 'executable',
     'sources': [
-      'src/phonenumbers/test_metadata.cc',
-      'src/test/phonenumbers/asyoutypeformatter_test.cc',
-      'src/test/phonenumbers/phonenumbermatch_test.cc',
-      'src/test/phonenumbers/phonenumbermatcher_test.cc',
-      'src/test/phonenumbers/phonenumberutil_test.cc',
-      'src/test/phonenumbers/regexp_adapter_test.cc',
-      'src/test/phonenumbers/stringutil_test.cc',
-      'src/test/phonenumbers/test_util.cc',
-      'src/test/phonenumbers/unicodestring_test.cc',
+      'src/cpp/src/phonenumbers/test_metadata.cc',
+      'src/cpp/test/phonenumbers/asyoutypeformatter_test.cc',
+      'src/cpp/test/phonenumbers/phonenumbermatch_test.cc',
+      'src/cpp/test/phonenumbers/phonenumbermatcher_test.cc',
+      'src/cpp/test/phonenumbers/phonenumberutil_test.cc',
+      'src/cpp/test/phonenumbers/regexp_adapter_test.cc',
+      'src/cpp/test/phonenumbers/stringutil_test.cc',
+      'src/cpp/test/phonenumbers/test_util.cc',
+      'src/cpp/test/phonenumbers/unicodestring_test.cc',
     ],
     'dependencies': [
       '../icu/icu.gyp:icui18n',
       '../icu/icu.gyp:icuuc',
       '../../base/base.gyp:run_all_unittests',
       '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
       '../../testing/gmock.gyp:gmock',
       '../../testing/gtest.gyp:gtest',
       'libphonenumber_without_metadata',
     ],
@@ skipping 11 matching lines @@
       }],
       # libphonenumber needs to fix their ODR violations. http://crbug.com/456021
       ['OS=="linux"', {
         'ldflags!': [
           '-Wl,--detect-odr-violations',
         ],
       }],
     ],
   }]
 }