From cb333530fc98d3e83402b8da95c0052fca0bf3e1 Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Thu, 16 Feb 2012 01:16:28 +0000 Subject: [PATCH] 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 --- src/common_settings.gypi | 21 --------------------- src/common_video/common_video.gyp | 4 ++-- 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 src/common_settings.gypi diff --git a/src/common_settings.gypi b/src/common_settings.gypi deleted file mode 100644 index 8d6428877..000000000 --- a/src/common_settings.gypi +++ /dev/null @@ -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: diff --git a/src/common_video/common_video.gyp b/src/common_video/common_video.gyp index 5f23cf960..3adb56c80 100644 --- a/src/common_video/common_video.gyp +++ b/src/common_video/common_video.gyp @@ -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 # that can be found in the LICENSE file in the root of the source @@ -8,7 +8,7 @@ { 'includes': [ - '../common_settings.gypi', # Common settings + '../build/common.gypi', 'libyuv/libyuv.gypi', 'jpeg/jpeg.gypi', ],