summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 15:25:44 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 15:25:44 +0000
commitb8e1f95cf888bba24fe3ef1d357474f23091235d (patch)
tree7c0333f38160abb6f6d28ea2502355c9f90d6c71 /base
parent5418f47e35f5a6c1b6a3248a4927cb2fa4b5aee1 (diff)
downloadchromium_src-b8e1f95cf888bba24fe3ef1d357474f23091235d.zip
chromium_src-b8e1f95cf888bba24fe3ef1d357474f23091235d.tar.gz
chromium_src-b8e1f95cf888bba24fe3ef1d357474f23091235d.tar.bz2
Bring the GYP-based build up to the current state of the trunk.
Review URL: http://codereview.chromium.org/27212 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10468 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/base.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/base.gyp b/base/base.gyp
index 774c92c..8b2da41 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -316,7 +316,6 @@
{ # else: OS != "linux"
'sources!': [
'atomicops_internals_x86_gcc.cc',
- 'data_pack.cc',
'hmac_nss.cc',
'idle_timer_none.cc',
'message_pump_glib.cc',
@@ -344,6 +343,7 @@
'sources/': [ ['exclude', '_(linux|mac|posix)\\.cc$'],
['exclude', '\\.mm?$' ] ],
'sources!': [
+ 'data_pack.cc',
'event_recorder_stubs.cc',
'message_pump_libevent.cc',
'string16.cc',