summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-23 01:13:52 +0000
committerslightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-23 01:13:52 +0000
commit74647d25acc05a4535f4de9df34d9f8de2724674 (patch)
tree3ffc171fde9a6f0e26ff976c0751714dcdb5a225
parente197835748fedb0b262291d7101ae072eef81b18 (diff)
downloadchromium_src-74647d25acc05a4535f4de9df34d9f8de2724674.zip
chromium_src-74647d25acc05a4535f4de9df34d9f8de2724674.tar.gz
chromium_src-74647d25acc05a4535f4de9df34d9f8de2724674.tar.bz2
Second phase of move for the support directory to a more reasonable location in the tree.
Review URL: http://codereview.chromium.org/144016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19000 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS3
-rw-r--r--chrome/chrome.gyp4
-rw-r--r--support/support.gyp21
3 files changed, 5 insertions, 23 deletions
diff --git a/DEPS b/DEPS
index 2e6e735..0487e82 100644
--- a/DEPS
+++ b/DEPS
@@ -9,6 +9,9 @@ deps = {
"src/breakpad/src":
"http://google-breakpad.googlecode.com/svn/trunk/src@346",
+ "src/build/util/support":
+ "/trunk/deps/support@18977",
+
"src/googleurl":
"http://google-url.googlecode.com/svn/trunk@106",
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index cf65e5f..8123564 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -2376,7 +2376,7 @@
'app/scoped_ole_initializer.h',
],
'dependencies': [
- '../support/support.gyp:*',
+ '../build/util/support/support.gyp:*',
],
'mac_bundle_resources': [
# put any pdfs down in the sources block below so pdfsqueeze runs on
@@ -4153,7 +4153,7 @@
'theme_dll',
'worker',
'../net/net.gyp:net_resources',
- '../support/support.gyp:*',
+ '../build/util/support/support.gyp:*',
'../third_party/cld/cld.gyp:cld',
'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
'../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
diff --git a/support/support.gyp b/support/support.gyp
deleted file mode 100644
index 3f215dc..0000000
--- a/support/support.gyp
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
- 'variables': {
- 'chromium_code': 1,
- },
- 'includes': [
- '../build/common.gypi',
- ],
- 'targets': [
- {
- 'target_name': 'support',
- 'type': 'none',
- },
- # TODO(slightlyoff)
- ],
-}
-
-# vim: shiftwidth=2:et:ai:tabstop=2