diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-16 04:56:06 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-16 04:56:06 +0000 |
| commit | 6b0349ef4ab90a6b99fc568f40e872a7f2ca39c9 (patch) | |
| tree | 9ba478afe564003c74927c1530741846f6aa1336 /base/base.gypi | |
| parent | b679032aef9317482f87ceaf67ee138aaa67a152 (diff) | |
| download | chromium_src-6b0349ef4ab90a6b99fc568f40e872a7f2ca39c9.zip chromium_src-6b0349ef4ab90a6b99fc568f40e872a7f2ca39c9.tar.gz chromium_src-6b0349ef4ab90a6b99fc568f40e872a7f2ca39c9.tar.bz2 | |
Move xdg_util into base/nix. I originally wanted to use base/linux, but you
can't have a namespace called "linux" because it's ifdefed by GCC to be a
number. Same for "unix". "x11" was discarded because some future stuff in
here will not be related to x11.
This also renames base_paths_posix to base_paths_linux since this does not
apply to mac, and normally posix applies to mac (this confused me when I had to
edit it for the XDG stuff).
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3778007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62848 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gypi')
| -rw-r--r-- | base/base.gypi | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/base/base.gypi b/base/base.gypi index fee14af..b608e82 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -31,7 +31,7 @@ 'base_paths.h', 'base_paths_mac.h', 'base_paths_mac.mm', - 'base_paths_posix.cc', + 'base_paths_linux.cc', 'base_paths_win.cc', 'base_paths_win.h', 'base_switches.cc', @@ -315,8 +315,8 @@ 'worker_pool_mac.h', 'worker_pool_mac.mm', 'worker_pool_win.cc', - 'xdg_util.h', - 'xdg_util.cc', + 'nix/xdg_util.h', + 'nix/xdg_util.cc', ], 'include_dirs': [ '..', @@ -331,13 +331,11 @@ 'conditions': [ [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"', { 'sources/': [ - ['exclude', '/xdg_[^/]*\\.cc$'], + ['exclude', '^nix/'], ], 'sources!': [ 'atomicops_internals_x86_gcc.cc', - 'base_paths_posix.cc', 'message_pump_glib.cc', - 'xdg_util.cc', ], }], [ 'OS != "linux"', { |