Removes script for generating supplement.gypi also adds git ignore for tools/gn.
BUG=N/A R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/7299004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5403 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
e02d47515f
commit
7ef7df57d8
2
.gitignore
vendored
2
.gitignore
vendored
@ -83,6 +83,7 @@
|
||||
/tools/android
|
||||
/tools/android-dummy-test
|
||||
/tools/clang
|
||||
/tools/gn
|
||||
/tools/grit
|
||||
/tools/gritsettings
|
||||
/tools/gyp
|
||||
@ -94,7 +95,6 @@
|
||||
/webrtc/modules/audio_device/android/test/bin/
|
||||
/webrtc/modules/audio_device/android/test/gen/
|
||||
/webrtc/modules/audio_device/android/test/libs/
|
||||
/webrtc/supplement.gypi
|
||||
/webrtc/video_engine/test/android/bin
|
||||
/webrtc/video_engine/test/android/gen
|
||||
/webrtc/video_engine/test/android/libs
|
||||
|
7
DEPS
7
DEPS
@ -253,13 +253,6 @@ hooks = [
|
||||
"-s", Var("root_dir") + "/tools/gn/bin/linux/gn32.sha1",
|
||||
],
|
||||
},
|
||||
{
|
||||
# Create a supplement.gypi file under trunk/webrtc. This file will be picked
|
||||
# up by gyp and used to enable the standalone build.
|
||||
"pattern": ".",
|
||||
"action": ["python", Var("root_dir") + "/tools/create_supplement_gypi.py",
|
||||
Var("root_dir") + "/webrtc/supplement.gypi"],
|
||||
},
|
||||
{
|
||||
# Pull clang on mac. If nothing changed, or on non-mac platforms, this takes
|
||||
# zero seconds to run. If something changed, it downloads a prebuilt clang.
|
||||
|
@ -1,26 +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.
|
||||
|
||||
import sys
|
||||
|
||||
supplement_gypi = """#!/usr/bin/env python
|
||||
# This file is generated by %s. Not for check-in.
|
||||
# Please see the WebRTC DEPS file for details.
|
||||
{
|
||||
'variables': {
|
||||
'build_with_chromium': 0,
|
||||
}
|
||||
}
|
||||
"""
|
||||
|
||||
def main(argv):
|
||||
open(argv[1], 'w').write(supplement_gypi % argv[0])
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.exit(main(sys.argv))
|
@ -14,8 +14,7 @@
|
||||
'variables': {
|
||||
'variables': {
|
||||
'variables': {
|
||||
# This will be set to zero in the supplement.gypi triggered by a
|
||||
# gclient hook in the standalone build.
|
||||
# This will already be set to zero by supplement.gypi
|
||||
'build_with_chromium%': 1,
|
||||
},
|
||||
'build_with_chromium%': '<(build_with_chromium)',
|
||||
|
5
webrtc/supplement.gypi
Normal file
5
webrtc/supplement.gypi
Normal file
@ -0,0 +1,5 @@
|
||||
{
|
||||
'variables': {
|
||||
'build_with_chromium': 0,
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user