Skip to content

GitLab

T
tangled
Commit c8868c8b authored by brettw@chromium.org's avatar brettw@chromium.org
Browse files
Options

Convert the re2 GYP targets to be generated by GN. 

BUG=288991
R=bradnelson@google.com
Reland of r245254

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245563 0039d316-1c4b-4281-b951-d872f2087c98
parent 55ad8c14
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 104 deletions
build/all.gyp
View file @ c8868c8b
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
'../media/cast/cast.gyp:*', '../media/cast/cast.gyp:*',
'../media/media.gyp:*', '../media/media.gyp:*',
'../mojo/mojo.gyp:*', '../mojo/mojo.gyp:*',
'../out/gn_gyp/third_party/re2/re2.gyp:re2',
'../ppapi/ppapi.gyp:*', '../ppapi/ppapi.gyp:*',
'../ppapi/ppapi_internal.gyp:*', '../ppapi/ppapi_internal.gyp:*',
'../printing/printing.gyp:*', '../printing/printing.gyp:*',
...@@ -65,7 +66,6 @@ ...@@ -65,7 +66,6 @@
'../third_party/npapi/npapi.gyp:*', '../third_party/npapi/npapi.gyp:*',
'../third_party/ots/ots.gyp:*', '../third_party/ots/ots.gyp:*',
'../third_party/qcms/qcms.gyp:*', '../third_party/qcms/qcms.gyp:*',
'../third_party/re2/re2.gyp:re2',
'../third_party/WebKit/public/all.gyp:*', '../third_party/WebKit/public/all.gyp:*',
'../tools/gn/gn.gyp:*', '../tools/gn/gn.gyp:*',
'../tools/perf/clear_system_cache/clear_system_cache.gyp:*', '../tools/perf/clear_system_cache/clear_system_cache.gyp:*',
......
chrome/chrome_browser.gypi
View file @ c8868c8b
...@@ -2631,7 +2631,7 @@ ...@@ -2631,7 +2631,7 @@
'../third_party/libusb/libusb.gyp:libusb', '../third_party/libusb/libusb.gyp:libusb',
'../third_party/libyuv/libyuv.gyp:libyuv', '../third_party/libyuv/libyuv.gyp:libyuv',
'../third_party/npapi/npapi.gyp:npapi', '../third_party/npapi/npapi.gyp:npapi',
'../third_party/re2/re2.gyp:re2', '../out/gn_gyp/third_party/re2/re2.gyp:re2',
'../third_party/webrtc/modules/modules.gyp:desktop_capture', '../third_party/webrtc/modules/modules.gyp:desktop_capture',
'../ui/gl/gl.gyp:gl', '../ui/gl/gl.gyp:gl',
'../ui/surface/surface.gyp:surface', '../ui/surface/surface.gyp:surface',
......
chrome/chrome_browser_chromeos.gypi
View file @ c8868c8b
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
'../third_party/npapi/npapi.gyp:npapi', '../third_party/npapi/npapi.gyp:npapi',
'../third_party/protobuf/protobuf.gyp:protobuf_lite', '../third_party/protobuf/protobuf.gyp:protobuf_lite',
'../third_party/protobuf/protobuf.gyp:protoc#host', '../third_party/protobuf/protobuf.gyp:protoc#host',
'../third_party/re2/re2.gyp:re2', '../out/gn_gyp/third_party/re2/re2.gyp:re2',
'../third_party/zlib/zlib.gyp:zlib', '../third_party/zlib/zlib.gyp:zlib',
'../ui/base/strings/ui_strings.gyp:ui_strings', '../ui/base/strings/ui_strings.gyp:ui_strings',
'../ui/events/events.gyp:dom4_keycode_converter', '../ui/events/events.gyp:dom4_keycode_converter',
......
chrome/chrome_browser_extensions.gypi
View file @ c8868c8b
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
'../third_party/icu/icu.gyp:icuuc', '../third_party/icu/icu.gyp:icuuc',
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
'../third_party/libusb/libusb.gyp:libusb', '../third_party/libusb/libusb.gyp:libusb',
'../third_party/re2/re2.gyp:re2', '../out/gn_gyp/third_party/re2/re2.gyp:re2',
'../third_party/webrtc/modules/modules.gyp:desktop_capture', '../third_party/webrtc/modules/modules.gyp:desktop_capture',
'../ui/base/strings/ui_strings.gyp:ui_strings', '../ui/base/strings/ui_strings.gyp:ui_strings',
'../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx',
......
chrome/chrome_browser_ui.gypi
View file @ c8868c8b
...@@ -2637,7 +2637,7 @@ ...@@ -2637,7 +2637,7 @@
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
'../third_party/libjingle/libjingle.gyp:libjingle', '../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/npapi/npapi.gyp:npapi', '../third_party/npapi/npapi.gyp:npapi',
'../third_party/re2/re2.gyp:re2', '../out/gn_gyp/third_party/re2/re2.gyp:re2',
'../ui/compositor/compositor.gyp:compositor', '../ui/compositor/compositor.gyp:compositor',
'../ui/surface/surface.gyp:surface', '../ui/surface/surface.gyp:surface',
'../ui/web_dialogs/web_dialogs.gyp:web_dialogs', '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
......
chrome/chrome_common.gypi
View file @ c8868c8b
...@@ -422,7 +422,7 @@ ...@@ -422,7 +422,7 @@
'<(DEPTH)/extensions/extensions.gyp:extensions_common', '<(DEPTH)/extensions/extensions.gyp:extensions_common',
'<(DEPTH)/ipc/ipc.gyp:ipc', '<(DEPTH)/ipc/ipc.gyp:ipc',
'<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h', '<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h',
'<(DEPTH)/third_party/re2/re2.gyp:re2', '<(DEPTH)/out/gn_gyp/third_party/re2/re2.gyp:re2',
'<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
], ],
}, { # OS == ios }, { # OS == ios
......
chrome/chrome_renderer.gypi
View file @ c8868c8b
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
'../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc', '../third_party/icu/icu.gyp:icuuc',
'../third_party/npapi/npapi.gyp:npapi', '../third_party/npapi/npapi.gyp:npapi',
'../third_party/re2/re2.gyp:re2', '../out/gn_gyp/third_party/re2/re2.gyp:re2',
'../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
'../ui/surface/surface.gyp:surface', '../ui/surface/surface.gyp:surface',
'../webkit/child/webkit_child.gyp:webkit_child', '../webkit/child/webkit_child.gyp:webkit_child',
......
chrome/tools/profile_reset/jtl_compiler.gyp
View file @ c8868c8b
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
'product_name': 'jtl_compiler', 'product_name': 'jtl_compiler',
'dependencies': [ 'dependencies': [
'../../../base/base.gyp:base', '../../../base/base.gyp:base',
'../../../third_party/re2/re2.gyp:re2', '../../../out/gn_gyp/third_party/re2/re2.gyp:re2',
], ],
'sources': [ 'sources': [
'../../browser/profile_resetter/jtl_foundation.h', '../../browser/profile_resetter/jtl_foundation.h',
......
components/plugins.gypi
View file @ c8868c8b
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
'dependencies': [ 'dependencies': [
'../gin/gin.gyp:gin', '../gin/gin.gyp:gin',
'../skia/skia.gyp:skia', '../skia/skia.gyp:skia',
'../third_party/re2/re2.gyp:re2', '../out/gn_gyp/third_party/re2/re2.gyp:re2',
'../third_party/WebKit/public/blink.gyp:blink', '../third_party/WebKit/public/blink.gyp:blink',
'../v8/tools/gyp/v8.gyp:v8', '../v8/tools/gyp/v8.gyp:v8',
], ],
......
components/url_matcher.gypi
View file @ c8868c8b
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
'dependencies': [ 'dependencies': [
'../base/base.gyp:base', '../base/base.gyp:base',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../third_party/re2/re2.gyp:re2', '../out/gn_gyp/third_party/re2/re2.gyp:re2',
'../url/url.gyp:url_lib', '../url/url.gyp:url_lib',
], ],
'include_dirs': [ 'include_dirs': [
......
content/content_browser.gypi
View file @ c8868c8b
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
'../crypto/crypto.gyp:crypto', '../crypto/crypto.gyp:crypto',
'../google_apis/google_apis.gyp:google_apis', '../google_apis/google_apis.gyp:google_apis',
'../net/net.gyp:net', '../net/net.gyp:net',
'../out/gn_gyp/third_party/re2/re2.gyp:re2',
'../skia/skia.gyp:skia', '../skia/skia.gyp:skia',
'../sql/sql.gyp:sql', '../sql/sql.gyp:sql',
'../third_party/re2/re2.gyp:re2',
'../third_party/zlib/google/zip.gyp:zip', '../third_party/zlib/google/zip.gyp:zip',
'../third_party/zlib/zlib.gyp:zlib', '../third_party/zlib/zlib.gyp:zlib',
'../ui/accessibility/accessibility.gyp:accessibility', '../ui/accessibility/accessibility.gyp:accessibility',
......
extensions/extensions.gyp
View file @ c8868c8b
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
'../chrome/common/extensions/api/api.gyp:api', '../chrome/common/extensions/api/api.gyp:api',
'../components/components.gyp:url_matcher', '../components/components.gyp:url_matcher',
'../content/content.gyp:content_common', '../content/content.gyp:content_common',
'../third_party/re2/re2.gyp:re2', '../out/gn_gyp/third_party/re2/re2.gyp:re2',
], ],
'include_dirs': [ 'include_dirs': [
'..', '..',
......
gpu/command_buffer_service.gypi
View file @ c8868c8b
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
'../third_party/khronos/khronos.gyp:khronos_headers', '../third_party/khronos/khronos.gyp:khronos_headers',
'../third_party/protobuf/protobuf.gyp:protobuf_lite', '../third_party/protobuf/protobuf.gyp:protobuf_lite',
'../third_party/smhasher/smhasher.gyp:cityhash', '../third_party/smhasher/smhasher.gyp:cityhash',
'../third_party/re2/re2.gyp:re2', '../out/gn_gyp/third_party/re2/re2.gyp:re2',
], ],
'sources': [ 'sources': [
'command_buffer/service/async_pixel_transfer_delegate.cc', 'command_buffer/service/async_pixel_transfer_delegate.cc',
......
gpu/gpu_config.gypi
View file @ c8868c8b
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
{ {
'dependencies': [ 'dependencies': [
'../base/base.gyp:base', '../base/base.gyp:base',
'../third_party/re2/re2.gyp:re2', '../out/gn_gyp/third_party/re2/re2.gyp:re2',
'../ui/gl/gl.gyp:gl', '../ui/gl/gl.gyp:gl',
], ],
'include_dirs': [ 'include_dirs': [
......
third_party/leveldatabase/leveldatabase.gyp
View file @ c8868c8b
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
# base::LazyInstance is a template that pulls in dynamic_annotations so # base::LazyInstance is a template that pulls in dynamic_annotations so
# we need to explictly link in the code for dynamic_annotations. # we need to explictly link in the code for dynamic_annotations.
'../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../re2/re2.gyp:re2', '../../out/gn_gyp/third_party/re2/re2.gyp:re2',
], ],
'conditions': [ 'conditions': [
['use_snappy', { ['use_snappy', {
......
third_party/libaddressinput/libaddressinput.gyp
View file @ c8868c8b
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
'dependencies': [ 'dependencies': [
'libaddressinput_strings', 'libaddressinput_strings',
'<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/third_party/re2/re2.gyp:re2', '<(DEPTH)/out/gn_gyp/third_party/re2/re2.gyp:re2',
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'include_dirs': [ 'include_dirs': [
......
tools/gn/secondary/third_party/re2/BUILD.gn → third_party/re2/BUILD.gn
View file @ c8868c8b
...@@ -2,13 +2,12 @@ ...@@ -2,13 +2,12 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
gyp_file = "//out/gn_gyp/third_party/re2/re2.gyp"
config("re2_config") { config("re2_config") {
include_dirs = [ "." ] include_dirs = [ "." ]
} }
gyp_file = "re2.gyp"
external = true
static_library("re2") { static_library("re2") {
sources = [ sources = [
"mswin/stdint.h", "mswin/stdint.h",
...@@ -70,7 +69,6 @@ static_library("re2") { ...@@ -70,7 +69,6 @@ static_library("re2") {
if (is_win) { if (is_win) {
include_dirs = [ "mswin" ] include_dirs = [ "mswin" ]
# TODO(brettw) 'msvs_disabled_warnings': [ 4018, 4722, 4267 ],
} else { } else {
sources -= "mswin/stdint.h" sources -= "mswin/stdint.h"
} }
......
third_party/re2/re2.gyp deleted 100644 → 0
View file @ 55ad8c14
# 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 ],
}]
]
},
],
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment