diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .gn | 48 | ||||
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | OWNERS | 1 | ||||
| -rwxr-xr-x | setup_links.py | 1 |
5 files changed, 50 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 5e5d459ff9..336101616e 100644 --- a/.gitignore +++ b/.gitignore @@ -29,7 +29,6 @@ .cproject .gdb_history .gdbinit -.gn .metadata .project .pydevproject @@ -0,0 +1,48 @@ +# Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. +# +# Use of this source code is governed by a BSD-style license +# that can be found in the LICENSE file in the root of the source +# tree. An additional intellectual property rights grant can be found +# in the file PATENTS. All contributing project authors may +# be found in the AUTHORS file in the root of the source tree. + +# The location of the build configuration file. +buildconfig = "//build/config/BUILDCONFIG.gn" + +# The secondary source root is a parallel directory tree where +# GN build files are placed when they can not be placed directly +# in the source tree, e.g. for third party source trees. +secondary_source = "//build/secondary/" + +# These are the targets to check headers for by default. The files in targets +# matching these patterns (see "gn help label_pattern" for format) will have +# their includes checked for proper dependencies when you run either +# "gn check" or "gn gen --check". +check_targets = [ + "//webrtc/*", +] + +# These are the list of GN files that run exec_script. This whitelist exists +# to force additional review for new uses of exec_script, which is strongly +# discouraged except for gypi_to_gn calls. +exec_script_whitelist = [ + "//build/config/android/BUILD.gn", + "//build/config/android/config.gni", + "//build/config/android/internal_rules.gni", + "//build/config/android/rules.gni", + "//build/config/compiler/BUILD.gn", + "//build/config/gcc/gcc_version.gni", + "//build/config/ios/ios_sdk.gni", + "//build/config/linux/BUILD.gn", + "//build/config/linux/pkg_config.gni", + "//build/config/mac/mac_sdk.gni", + "//build/config/win/visual_studio_version.gni", + "//build/gn_helpers.py", + "//build/gypi_to_gn.py", + "//build/toolchain/gcc_toolchain.gni", + "//build/toolchain/mac/BUILD.gn", + "//build/toolchain/win/BUILD.gn", + "//third_party/boringssl/BUILD.gn", + "//third_party/opus/BUILD.gn", + "//webrtc/modules/video_render/BUILD.gn", +] @@ -6,7 +6,7 @@ vars = { 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': '5333e1468ef3af0099769d4ec6a4c74e9e603766', + 'chromium_revision': 'd8f8dc8f620e8b02e1ad8c3b9b88c262af0188c5', } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than @@ -6,6 +6,7 @@ tina.legrand@webrtc.org tommi@webrtc.org per-file .gitignore=* per-file AUTHORS=* +per-file .gn=kjellander@webrtc.org per-file BUILD.gn=kjellander@webrtc.org per-file DEPS=* per-file PRESUBMIT.py=kjellander@webrtc.org diff --git a/setup_links.py b/setup_links.py index e524bc0063..e5e3477018 100755 --- a/setup_links.py +++ b/setup_links.py @@ -93,7 +93,6 @@ if 'android' in get_target_os_list(): ] FILES = { - '.gn': None, 'tools/find_depot_tools.py': None, 'third_party/BUILD.gn': None, } |