From f97c8f3de5f49b07b0e431ba4c08f4edacd7d9dc Mon Sep 17 00:00:00 2001 From: "scottmg@google.com" Date: Mon, 28 May 2012 20:54:48 +0000 Subject: Revert 139259 - Remove redundant includes of common.gypi and unused repo from DEPS build/gyp_chromium forces include of build/common.gypi for all gyp files so including it in other .gyp files is redundant. In the case of some properties, it causes duplication in lists which causes problems. One of these was in build/util/support/support.gyp which is still getting synced, but apparently has been long deleted and removed (2011). But the DEPS were never rolled to remove the whole repo the last unused file got removed here http://codereview.chromium.org/6294009 apparently. Review URL: https://chromiumcodereview.appspot.com/10447026 TBR=scottmg@google.com Review URL: https://chromiumcodereview.appspot.com/10459004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139261 0039d316-1c4b-4281-b951-d872f2087c98 --- DEPS | 3 +++ chrome_frame/crash_reporting/crash_reporting.gyp | 3 +++ .../virtual_driver/win/port_monitor/virtual_driver_port_monitor.gyp | 3 +++ 3 files changed, 9 insertions(+) diff --git a/DEPS b/DEPS index 66b7a98..1ce16dd 100644 --- a/DEPS +++ b/DEPS @@ -70,6 +70,9 @@ deps = { "src/breakpad/src": (Var("googlecode_url") % "google-breakpad") + "/trunk/src@939", + "src/build/util/support": + "/trunk/deps/support@20411", + "src/googleurl": (Var("googlecode_url") % "google-url") + "/trunk@175", diff --git a/chrome_frame/crash_reporting/crash_reporting.gyp b/chrome_frame/crash_reporting/crash_reporting.gyp index 1746041..f81838c 100644 --- a/chrome_frame/crash_reporting/crash_reporting.gyp +++ b/chrome_frame/crash_reporting/crash_reporting.gyp @@ -3,6 +3,9 @@ # found in the LICENSE file. { + 'includes': [ + '../../build/common.gypi', + ], 'target_defaults': { 'include_dirs': [ # all our own includes are relative to src/ diff --git a/cloud_print/virtual_driver/win/port_monitor/virtual_driver_port_monitor.gyp b/cloud_print/virtual_driver/win/port_monitor/virtual_driver_port_monitor.gyp index 630b5e4..9186e9b 100644 --- a/cloud_print/virtual_driver/win/port_monitor/virtual_driver_port_monitor.gyp +++ b/cloud_print/virtual_driver/win/port_monitor/virtual_driver_port_monitor.gyp @@ -3,6 +3,9 @@ # found in the LICENSE file. { + 'includes': [ + '../../../../build/common.gypi', + ], 'target_defaults': { 'variables': { 'chromium_code': 1, -- cgit v1.1