Remove common_settings.gypi.
Now fully replaced by src/build/common.gypi. BUG= TEST=build Review URL: https://webrtc-codereview.appspot.com/395003 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1699 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
f5da4da409
commit
cb333530fc
@ -1,21 +0,0 @@
|
|||||||
# Copyright (c) 2011 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.
|
|
||||||
|
|
||||||
# Placeholder until all gyp files point to build/common.gypi instead.
|
|
||||||
|
|
||||||
{
|
|
||||||
'includes': [
|
|
||||||
'build/common.gypi',
|
|
||||||
],
|
|
||||||
}
|
|
||||||
|
|
||||||
# Local Variables:
|
|
||||||
# tab-width:2
|
|
||||||
# indent-tabs-mode:nil
|
|
||||||
# End:
|
|
||||||
# vim: set expandtab tabstop=2 shiftwidth=2:
|
|
@ -1,4 +1,4 @@
|
|||||||
# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
|
# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
||||||
#
|
#
|
||||||
# Use of this source code is governed by a BSD-style license
|
# 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
|
# that can be found in the LICENSE file in the root of the source
|
||||||
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
'includes': [
|
'includes': [
|
||||||
'../common_settings.gypi', # Common settings
|
'../build/common.gypi',
|
||||||
'libyuv/libyuv.gypi',
|
'libyuv/libyuv.gypi',
|
||||||
'jpeg/jpeg.gypi',
|
'jpeg/jpeg.gypi',
|
||||||
],
|
],
|
||||||
|
Loading…
Reference in New Issue
Block a user