rename some _linux files to _posix and introduce os_bsd

The os_bsd variable is only available on FreeBSD and OpenBSD.
Later on others like NetBSD and DragonflyBSD can be added.
This variable was introduced in order to have shorter
conditions in the gyp files.

BUG=
TEST=compile

Patch by Robert Nagy <robert.nagy@gmail.com>
Review URL: http://codereview.chromium.org/8567001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109929 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 11 insertions, 10 deletions

diff --git a/base/base.gypi b/base/base.gypi
index 8cfd5fd..e1877c9 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -46,7 +46,7 @@
           'base_paths_android.cc',
           'base_paths_mac.h',
           'base_paths_mac.mm',
-          'base_paths_linux.cc',
+          'base_paths_posix.cc',
           'base_paths_win.cc',
           'base_paths_win.h',
           'base_switches.h',
@@ -196,8 +196,8 @@
           'metrics/stats_table.cc',
           'metrics/stats_table.h',
           'native_library.h',
-          'native_library_linux.cc',
           'native_library_mac.mm',
+          'native_library_posix.cc',
           'native_library_win.cc',
           'observer_list.h',
           'observer_list_threadsafe.h',
@@ -293,8 +293,8 @@
           'sys_info_posix.cc',
           'sys_info_win.cc',
           'sys_string_conversions.h',
-          'sys_string_conversions_linux.cc',
           'sys_string_conversions_mac.mm',
+          'sys_string_conversions_posix.cc',
           'sys_string_conversions_win.cc',
           'task.cc',
           'task.h',
@@ -450,10 +450,8 @@
               'system_monitor/system_monitor_posix.cc',
             ],
             'sources/': [
-              ['include', '^native_library_linux\\.cc$'],
               ['include', '^process_util_linux\\.cc$'],
               ['include', '^sys_info_linux\\.cc$'],
-              ['include', '^sys_string_conversions_linux\\.cc$'],
               ['include', '^worker_pool_linux\\.cc$'],
               # TODO(michaelbai): The below files are excluded because of the
               # missing JNI, add them back when JNI is ready.
@@ -509,8 +507,11 @@
             ],
           }],
           [ 'OS == "mac"', {
-            'sources!': [
-              'files/file_path_watcher_stub.cc',
+            'sources/': [
+              ['exclude', '^files/file_path_watcher_stub\\.cc$'],
+              ['exclude', '^base_paths_posix\\.cc$'],
+              ['exclude', '^native_library_posix\\.cc$'],
+              ['exclude', '^sys_string_conversions_posix\\.cc$'],
             ],
           }],
           [ 'OS == "openbsd"', {
@@ -619,7 +620,7 @@
             }],
           ],
         }],
-        [ 'OS == "freebsd" or OS == "openbsd"', {
+        [ 'os_bsd==1', {
           'include_dirs': [
             '/usr/local/include',
           ],
diff --git a/base/base_paths_linux.cc b/base/base_paths_posix.cc
index 36d5ee7..14d17d6 100644
--- a/base/base_paths_linux.cc
+++ b/base/base_paths_posix.cc
@@ -31,7 +31,7 @@ const char kSelfExe[] = "/proc/self/exe";
 
 // The name of this file relative to the source root. This is used for checking
 // that the source checkout is in the correct place.
-static const char kThisSourceFile[] = "base/base_paths_linux.cc";
+static const char kThisSourceFile[] = "base/base_paths_posix.cc";
 
 bool PathProviderPosix(int key, FilePath* result) {
   FilePath path;
diff --git a/base/native_library_linux.cc b/base/native_library_posix.cc
index 4b82ff4..4b82ff4 100644
--- a/base/native_library_linux.cc
+++ b/base/native_library_posix.cc
diff --git a/base/sys_string_conversions_linux.cc b/base/sys_string_conversions_posix.cc
index 2dc6b6f..f46259d 100644
--- a/base/sys_string_conversions_linux.cc
+++ b/base/sys_string_conversions_posix.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.