diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 18:49:41 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 18:49:41 +0000 |
commit | dadf8c49e3a2deb3c79c3e95e1702cab95eeaab7 (patch) | |
tree | f263c4bd212f52ac02a4207093abc74afea25b80 /third_party/re2 | |
parent | 83146ab03ac84854485a5ba57159882fca685127 (diff) | |
download | chromium_src-dadf8c49e3a2deb3c79c3e95e1702cab95eeaab7.zip chromium_src-dadf8c49e3a2deb3c79c3e95e1702cab95eeaab7.tar.gz chromium_src-dadf8c49e3a2deb3c79c3e95e1702cab95eeaab7.tar.bz2 |
Revert of Convert the re2 GYP targets to be generated by GN. (https://codereview.chromium.org/68853015/)
Reason for revert:
Broke Blink compile
Original issue's description:
> Convert the re2 GYP targets to be generated by GN.
>
> BUG=288991
> R=bradnelson@google.com
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=245254
TBR=bradnelson@chromium.org,bradnelson@google.com
NOTREECHECKS=true
NOTRY=true
BUG=288991
Review URL: https://codereview.chromium.org/141063002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/re2')
-rw-r--r-- | third_party/re2/BUILD.gn | 75 | ||||
-rw-r--r-- | third_party/re2/re2.gyp | 84 |
2 files changed, 84 insertions, 75 deletions
diff --git a/third_party/re2/BUILD.gn b/third_party/re2/BUILD.gn deleted file mode 100644 index 8ae94a2..0000000 --- a/third_party/re2/BUILD.gn +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright (c) 2013 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. - -gyp_file = "//out/gn_gyp/third_party/re2/re2.gyp" - -config("re2_config") { - include_dirs = [ "." ] -} - -static_library("re2") { - sources = [ - "mswin/stdint.h", - "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", - ] - - configs -= "//build/config/compiler:chromium_code" - configs += "//build/config/compiler:no_chromium_code" - direct_dependent_configs = [ ":re2_config" ] - - deps = [ - "//base/third_party/dynamic_annotations", - ] - - if (is_win) { - include_dirs = [ "mswin" ] - } 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 ], + }] + ] + }, + ], +} |