diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-22 09:27:25 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-22 09:27:25 +0000 |
commit | d4e827f87e47a47b93a0c68ad8629820ec6e832b (patch) | |
tree | d602f65f491937e84915a1221e87b39167bee0b8 /third_party/re2 | |
parent | e20df7ba4595fe32ec0872ba83baf76de0e93b4f (diff) | |
download | chromium_src-d4e827f87e47a47b93a0c68ad8629820ec6e832b.zip chromium_src-d4e827f87e47a47b93a0c68ad8629820ec6e832b.tar.gz chromium_src-d4e827f87e47a47b93a0c68ad8629820ec6e832b.tar.bz2 |
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
Diffstat (limited to 'third_party/re2')
-rw-r--r-- | third_party/re2/BUILD.gn | 5 | ||||
-rw-r--r-- | third_party/re2/re2.gyp | 84 |
2 files changed, 88 insertions, 1 deletions
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 ], + }] + ] + }, + ], +} |