diff --git a/DEPS b/DEPS index 7e49062330..6fe1369e62 100644 --- a/DEPS +++ b/DEPS @@ -4,7 +4,6 @@ # instead. vars = { - 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', 'chromium_revision': '5e821a778b85878bafcc8128f64333fd518c79a5', } diff --git a/tools/autoroller/unittests/DEPS b/tools/autoroller/unittests/DEPS index 71f01ad827..82638f8ee9 100644 --- a/tools/autoroller/unittests/DEPS +++ b/tools/autoroller/unittests/DEPS @@ -1,7 +1,6 @@ # Sample DEPS file for testing. vars = { - 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', 'chromium_revision': '1b9c098a08e40114e44b6c1ec33ddf95c40b901d', } diff --git a/tools/autoroller/unittests/roll_chromium_revision_test.py b/tools/autoroller/unittests/roll_chromium_revision_test.py index cb3c776a84..7c899e92a9 100755 --- a/tools/autoroller/unittests/roll_chromium_revision_test.py +++ b/tools/autoroller/unittests/roll_chromium_revision_test.py @@ -21,7 +21,6 @@ from roll_chromium_revision import ParseDepsDict, UpdateDeps, \ GetMatchingDepsEntries TEST_DATA_VARS = { - 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', 'chromium_revision': '1b9c098a08e40114e44b6c1ec33ddf95c40b901d', } @@ -61,7 +60,6 @@ class TestRollChromiumRevision(unittest.TestCase): def assertVar(variable_name): self.assertEquals(vars_dict[variable_name], TEST_DATA_VARS[variable_name]) - assertVar('extra_gyp_flag') assertVar('chromium_git') assertVar('chromium_revision') diff --git a/webrtc/build/extra_gitignore.py b/webrtc/build/extra_gitignore.py deleted file mode 100755 index f8496686bb..0000000000 --- a/webrtc/build/extra_gitignore.py +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2012 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. - -""" Adds extra patterns to the root .gitignore file. - -Reads the contents of the filename given as the first argument and appends -them to the root .gitignore file. The new entires are intended to be additional -ignoring patterns, or negating patterns to override existing entries (man -gitignore for more details). -""" - -import os -import sys - -MODIFY_STRING = '# The following added by %s\n' - - -def main(argv): - if not argv[1]: - # Special case; do nothing. - return 0 - - modify_string = MODIFY_STRING % argv[0] - gitignore_file = os.path.dirname(argv[0]) + '/../../.gitignore' - lines = open(gitignore_file, 'r').readlines() - for i, line in enumerate(lines): - # Look for modify_string in the file to ensure we don't append the extra - # patterns more than once. - if line == modify_string: - lines = lines[:i] - break - lines.append(modify_string) - - f = open(gitignore_file, 'w') - f.write(''.join(lines)) - f.write(open(argv[1], 'r').read()) - f.close() - -if __name__ == '__main__': - sys.exit(main(sys.argv))