Re-committing http://codereview.chromium.org/8736001/ originally committed revision=112305

third_party/libphonenumber/libphonenumber.gyp

Index: third_party/libphonenumber/libphonenumber.gyp
===================================================================
--- third_party/libphonenumber/libphonenumber.gyp	(revision 112797)
+++ third_party/libphonenumber/libphonenumber.gyp	(working copy)
@@ -8,15 +8,17 @@
       '../..',  # add it first, so src/base headers are used instead of the ones
                 # brought with the library as cc files would be taken from the
                 # main chrome tree as well.
-      'cpp/src',
+      'src',
+      'src/test',
       # The libphonenumber source (and test code) expects the
-      # generated protocol headers to be available with no include
-      # path, e.g. #include "foo.pb.h".
+      # 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': [
       'USE_HASH_MAP=1',
       'USE_GOOGLE_BASE=1',
+      'USE_ICU_REGEXP=1',
     ],
   },
   'includes': [
@@ -32,32 +34,36 @@
       '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
     ],
     'sources': [
-      # 'chrome/regexp_adapter_icuregexp.cc',
-      'cpp/src/default_logger.cc',
-      'cpp/src/lite_metadata.cc',
-      'cpp/src/logger.cc',
-      'cpp/src/phonenumber.cc',
-      'cpp/src/phonenumberutil.cc',
-      'cpp/src/regexp_adapter_icu.cc',
-      'cpp/src/regexp_cache.cc',
-      'cpp/src/stringutil.cc',
-      'cpp/src/utf/rune.c',
-      'cpp/src/utf/unicodetext.cc',
-      'cpp/src/utf/unilib.cc',
-      'resources/phonemetadata.proto',
-      'resources/phonenumber.proto',
+      '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',
+      # The following two files should be added on 'as needed' basis.
+      #'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/stringutil.cc',
+      'src/phonenumbers/unicodestring.cc',
+      'src/phonenumbers/utf/rune.c',
+      'src/phonenumbers/utf/unicodetext.cc',
+      'src/phonenumbers/utf/unilib.cc',
+      'src/resources/phonemetadata.proto',
+      'src/resources/phonenumber.proto',
     ],
     'direct_dependent_settings': {
       'include_dirs': [
-        # The libphonenumber headers expect generated protocol headers
-        # to be available with no include path, e.g. #include
-        # "foo.pb.h".
         '<(SHARED_INTERMEDIATE_DIR)/protoc_out/third_party/libphonenumber',
       ],
     },
     'variables': {
-      'proto_in_dir': 'resources',
-      'proto_out_dir': 'third_party/libphonenumber',
+      'proto_in_dir': 'src/resources',
+      'proto_out_dir': 'third_party/libphonenumber/phonenumbers',
     },
     'includes': [ '../../build/protoc.gypi' ],
     'conditions': [
@@ -73,10 +79,16 @@
     'type': 'executable',
     'sources': [
       '../../base/test/run_all_unittests.cc',
-      'cpp/src/phonenumberutil_test.cc',
-      'cpp/src/regexp_adapter_test.cc',
-      'cpp/src/stringutil_test.cc',
-      'cpp/src/test_metadata.cc',
+      'src/phonenumbers/test_metadata.cc',
+      'src/test/phonenumbers/asyoutypeformatter_test.cc',
+      # The following two files should be added on 'as needed' basis.
+      #'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',
     ],
     'dependencies': [
       '../icu/icu.gyp:icui18n',