Revert 245563 and 245800 which made re2 GN generated.

This change keeps the BUILD file in the new location and does not resort the .gyp files to facilitate relanding.

TBR=thakis
BUG=

Review URL: https://codereview.chromium.org/132693017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246255 0039d316-1c4b-4281-b951-d872f2087c98

19 files changed, 105 insertions, 18 deletions

diff --git a/build/all.gyp b/build/all.gyp
index d568589e..22d8615 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -35,7 +35,7 @@
       'conditions': [
         ['OS!="ios"', {
           'dependencies': [
-            '../<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',
+            '../third_party/re2/re2.gyp:re2',
             '../cc/cc_tests.gyp:*',
             '../device/bluetooth/bluetooth.gyp:*',
             '../device/device_tests.gyp:*',
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index e94ee6a..c67c63e 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2613,7 +2613,7 @@
             'installer_util',
             'sync_file_system_drive_proto',
             'sync_file_system_proto',
-            '../<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',
+            '../third_party/re2/re2.gyp:re2',
             '../cc/cc.gyp:cc',
             '../components/components.gyp:autofill_content_browser',
             '../components/components.gyp:browser_context_keyed_service',
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index dbd8da9..3a6a1a9 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -42,7 +42,7 @@
         'installer_util',
         'safe_browsing_proto',
         'safe_browsing_report_proto',
-        '../<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',
+        '../third_party/re2/re2.gyp:re2',
         '../breakpad/breakpad.gyp:breakpad_client',
         '../build/linux/system.gyp:dbus',
         '../chromeos/chromeos.gyp:chromeos',
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 09ad962..aad6288 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -28,7 +28,7 @@
         'installer_util',
         'safe_browsing_proto',
         'sync_file_system_proto',
-        '../<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',
+        '../third_party/re2/re2.gyp:re2',
         '../components/component_strings.gyp:component_strings',
         '../components/components.gyp:onc_component',
         '../components/components.gyp:url_matcher',
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 3d5ef64..429e7db 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2623,7 +2623,7 @@
             'common/extensions/api/api.gyp:api',
             'debugger',
             'installer_util',
-            '../<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',
+            '../third_party/re2/re2.gyp:re2',
             '../components/components.gyp:autofill_content_risk_proto',
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
             '../media/media.gyp:media',
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 80a4bdd..4472a55 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -414,7 +414,7 @@
         }],
         ['OS != "ios"', {
           'dependencies': [
-            '<(DEPTH)/<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',
+            '<(DEPTH)/third_party/re2/re2.gyp:re2',
             '<(DEPTH)/chrome/common/extensions/api/api.gyp:api',
             '<(DEPTH)/components/components.gyp:autofill_core_common',
             '<(DEPTH)/components/components.gyp:autofill_content_common',
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 8325c3a..9edb7b9 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -13,7 +13,7 @@
         'common_net',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
-        '../<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',
+        '../third_party/re2/re2.gyp:re2',
         '../components/components.gyp:autofill_content_renderer',
         '../components/components.gyp:startup_metric_utils',
         '../components/components.gyp:plugins_renderer',
diff --git a/chrome/tools/profile_reset/jtl_compiler.gyp b/chrome/tools/profile_reset/jtl_compiler.gyp
index f78c25e..6d21015 100644
--- a/chrome/tools/profile_reset/jtl_compiler.gyp
+++ b/chrome/tools/profile_reset/jtl_compiler.gyp
@@ -22,7 +22,7 @@
       'type': 'static_library',
       'product_name': 'jtl_compiler',
       'dependencies': [
-        '../../../<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',
+        '../../../third_party/re2/re2.gyp:re2',
         '../../../base/base.gyp:base',
       ],
       'sources': [
diff --git a/components/plugins.gypi b/components/plugins.gypi
index 7ccd46f..e56ed09 100644
--- a/components/plugins.gypi
+++ b/components/plugins.gypi
@@ -11,7 +11,7 @@
           'target_name': 'plugins_renderer',
           'type': 'static_library',
           'dependencies': [
-            '../<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',
+            '../third_party/re2/re2.gyp:re2',
             '../gin/gin.gyp:gin',
             '../skia/skia.gyp:skia',
             '../third_party/WebKit/public/blink.gyp:blink',
diff --git a/components/url_matcher.gypi b/components/url_matcher.gypi
index 348795a..4d2e328 100644
--- a/components/url_matcher.gypi
+++ b/components/url_matcher.gypi
@@ -8,7 +8,7 @@
       'target_name': 'url_matcher',
       'type': '<(component)',
       'dependencies': [
-        '../<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',
+        '../third_party/re2/re2.gyp:re2',
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../url/url.gyp:url_lib',
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 8ee4996..0cad2bd 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -4,7 +4,7 @@
 
 {
   'dependencies': [
-    '../<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',
+    '../third_party/re2/re2.gyp:re2',
     '../base/base.gyp:base_static',
     '../crypto/crypto.gyp:crypto',
     '../google_apis/google_apis.gyp:google_apis',
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index a1c7020..725c675 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -11,7 +11,7 @@
       'target_name': 'extensions_common',
       'type': 'static_library',
       'dependencies': [
-        '../<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',
+        '../third_party/re2/re2.gyp:re2',
         # TODO(benwells): figure out what to do with the api target and
         # api resources compiled into the chrome resource bundle.
         # http://crbug.com/162530
diff --git a/gpu/command_buffer_service.gypi b/gpu/command_buffer_service.gypi
index 4d4b74e..6d5b3fd 100644
--- a/gpu/command_buffer_service.gypi
+++ b/gpu/command_buffer_service.gypi
@@ -12,7 +12,7 @@
     ],
   },
   'dependencies': [
-    '../<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',
+    '../third_party/re2/re2.gyp:re2',
     '../base/base.gyp:base',
     '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
     '../crypto/crypto.gyp:crypto',
diff --git a/gpu/gpu_config.gypi b/gpu/gpu_config.gypi
index c44da74..1e0bfba 100644
--- a/gpu/gpu_config.gypi
+++ b/gpu/gpu_config.gypi
@@ -4,7 +4,7 @@
 
 {
   'dependencies': [
-    '../<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',
+    '../third_party/re2/re2.gyp:re2',
     '../base/base.gyp:base',
     '../ui/gl/gl.gyp:gl',
   ],
diff --git a/third_party/leveldatabase/leveldatabase.gyp b/third_party/leveldatabase/leveldatabase.gyp
index 138e300..49eb684 100644
--- a/third_party/leveldatabase/leveldatabase.gyp
+++ b/third_party/leveldatabase/leveldatabase.gyp
@@ -37,7 +37,7 @@
       'target_name': 'leveldatabase',
       'type': 'static_library',
       'dependencies': [
-        '../../<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',
+        '../../third_party/re2/re2.gyp:re2',
         '../../base/base.gyp:base',
         # base::LazyInstance is a template that pulls in dynamic_annotations so
         # we need to explictly link in the code for dynamic_annotations.
diff --git a/third_party/libaddressinput/libaddressinput.gyp b/third_party/libaddressinput/libaddressinput.gyp
index f3f84da..898d0e7 100644
--- a/third_party/libaddressinput/libaddressinput.gyp
+++ b/third_party/libaddressinput/libaddressinput.gyp
@@ -99,7 +99,7 @@
       ],
       'dependencies': [
         'libaddressinput_strings',
-        '<(DEPTH)/<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',
+        '<(DEPTH)/third_party/re2/re2.gyp:re2',
         '<(DEPTH)/base/base.gyp:base',
       ],
       'direct_dependent_settings': {
diff --git a/third_party/re2/BUILD.gn b/third_party/re2/BUILD.gn
index 9f3ba8d..67b4378 100644
--- a/third_party/re2/BUILD.gn
+++ b/third_party/re2/BUILD.gn
@@ -2,13 +2,15 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-gyp_file = "//$gyp_output_dir/gn_gyp/third_party/re2/re2.gyp"
+# TODO(brettw) use this value when we remove external=true below.
+#gyp_file = "//$gyp_output_dir/gn_gyp/third_party/re2/re2.gyp"
 
 config("re2_config") {
   include_dirs = [ "." ]
 }
 
 static_library("re2") {
+  external = true
   sources = [
     "mswin/stdint.h",
     "re2/bitstate.cc",
@@ -69,6 +71,7 @@ static_library("re2") {
 
   if (is_win) {
     include_dirs = [ "mswin" ]
+    # TODO(brettw) 'msvs_disabled_warnings': [ 4018, 4722, 4267 ],
   } else {
     sources -= [ "mswin/stdint.h" ]
   }
diff --git a/third_party/re2/re2.gyp b/third_party/re2/re2.gyp
new file mode 100644
index 0000000..3f7539a
--- /dev/null
+++ b/third_party/re2/re2.gyp
@@ -0,0 +1,84 @@
+# Copyright 2014 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.
+
+{
+  'targets': [
+    {
+      'target_name': 're2',
+      'type': 'static_library',
+      'include_dirs': [
+        '.',
+        '<(DEPTH)',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '.',
+          '<(DEPTH)',
+        ],
+      },
+      'dependencies': [
+        '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+      ],
+      'sources': [
+        're2/bitstate.cc',
+        're2/compile.cc',
+        're2/dfa.cc',
+        're2/filtered_re2.cc',
+        're2/filtered_re2.h',
+        're2/mimics_pcre.cc',
+        're2/nfa.cc',
+        're2/onepass.cc',
+        're2/parse.cc',
+        're2/perl_groups.cc',
+        're2/prefilter.cc',
+        're2/prefilter.h',
+        're2/prefilter_tree.cc',
+        're2/prefilter_tree.h',
+        're2/prog.cc',
+        're2/prog.h',
+        're2/re2.cc',
+        're2/re2.h',
+        're2/regexp.cc',
+        're2/regexp.h',
+        're2/set.cc',
+        're2/set.h',
+        're2/simplify.cc',
+        're2/stringpiece.h',
+        're2/tostring.cc',
+        're2/unicode_casefold.cc',
+        're2/unicode_casefold.h',
+        're2/unicode_groups.cc',
+        're2/unicode_groups.h',
+        're2/variadic_function.h',
+        're2/walker-inl.h',
+        'util/arena.cc',
+        'util/arena.h',
+        'util/atomicops.h',
+        'util/flags.h',
+        'util/hash.cc',
+        'util/logging.h',
+        'util/mutex.h',
+        'util/rune.cc',
+        'util/sparse_array.h',
+        'util/sparse_set.h',
+        'util/stringpiece.cc',
+        'util/stringprintf.cc',
+        'util/strutil.cc',
+        'util/utf.h',
+        'util/util.h',
+      ],
+      'conditions': [
+        ['OS=="win"', {
+          'sources': [
+            'mswin/stdint.h'
+          ],
+          'include_dirs': [
+            'mswin'
+          ],
+          'msvs_disabled_warnings': [ 4018, 4722, 4267 ],
+        }]
+      ]
+    },
+  ],
+}
diff --git a/tools/ipc_fuzzer/mutate/mutate.gyp b/tools/ipc_fuzzer/mutate/mutate.gyp
index 00415a7..63de959 100644
--- a/tools/ipc_fuzzer/mutate/mutate.gyp
+++ b/tools/ipc_fuzzer/mutate/mutate.gyp
@@ -47,7 +47,7 @@
       'target_name': 'ipc_message_util',
       'type': 'executable',
       'dependencies': [
-        '../../../<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',
+        '../../../third_party/re2/re2.gyp:re2',
         '../message_lib/message_lib.gyp:ipc_message_lib',
       ],
       'sources': [