From 56037b483b4448ddfbbf66617d51b70a6583cd0b Mon Sep 17 00:00:00 2001
From: "zork@chromium.org"
 <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 22 Sep 2009 18:21:29 +0000
Subject: Update chrome.gyp to build the sync library on Linux. Review URL:
 http://codereview.chromium.org/209026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26837 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/chrome.gyp | 45 ++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 10d058a2..8298e06 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -4564,7 +4564,6 @@
             '<(protoc_out_dir)',
           ],
           'defines' : [
-            'COMPILER_MSVC',
             'COMPILING_SYNCAPI_LIBRARY',
             '_CRT_SECURE_NO_WARNINGS',
             '_USE_32BIT_TIME_T',
@@ -4582,6 +4581,9 @@
           ],
           'conditions': [
             ['OS=="win"', {
+              'defines' : [
+                'COMPILER_MSVC',
+              ],
               'msvs_settings': {
                 'VCLinkerTool': {
                   'ImportLibrary': '$(OutDir)\\lib\\syncapi.lib',
@@ -4599,6 +4601,11 @@
                 '../third_party/pthreads-win32/pthreads.gyp:pthreads',
               ],
             }],
+            ['OS=="linux"', {
+              'defines': [
+                'POSIX',
+              ],
+            }],
           ],
         }],
         ['chrome_personalization==1 and OS=="win"', {
@@ -6381,7 +6388,6 @@
             '<(protoc_out_dir)',
           ],
           'defines' : [
-            'COMPILER_MSVC',
             '_CRT_SECURE_NO_WARNINGS',
             '_USE_32BIT_TIME_T',
             'kXmppProductName="chromium-sync"',
@@ -6394,10 +6400,19 @@
           ],
           'conditions': [
             ['OS=="win"', {
+              'defines' : [
+                'COMPILER_MSVC',
+              ],
               'dependencies': [
                 '../third_party/pthreads-win32/pthreads.gyp:pthreads',
               ],
             }],
+            ['OS=="linux"', {
+              'defines': [
+                'POSIX',
+                'OS_LINUX',
+              ],
+            }],
           ],
         },
         {
@@ -6436,7 +6451,6 @@
             '<(protoc_out_dir)',
           ],
           'defines' : [
-            'COMPILER_MSVC',
             'COMPILING_SYNCAPI_LIBRARY',
             'SYNC_ENGINE_VERSION_STRING="Unknown"',
             '_CRT_SECURE_NO_WARNINGS',
@@ -6453,6 +6467,9 @@
           ],
           'conditions': [
             ['OS=="win"', {
+              'defines' : [
+                'COMPILER_MSVC',
+              ],
               'dependencies': [
                 '../third_party/pthreads-win32/pthreads.gyp:pthreads',
               ],
@@ -6464,6 +6481,11 @@
                 ],
               },
             }],
+            ['OS=="linux"', {
+              'defines': [
+                'POSIX',
+              ],
+            }],
           ],
         },
         {
@@ -6567,8 +6589,6 @@
             'browser/sync/util/compat_pthread.h',
             'browser/sync/util/crypto_helpers.cc',
             'browser/sync/util/crypto_helpers.h',
-            'browser/sync/util/data_encryption.cc',
-            'browser/sync/util/data_encryption.h',
             'browser/sync/util/dbgq.h',
             'browser/sync/util/event_sys-inl.h',
             'browser/sync/util/event_sys.h',
@@ -6578,7 +6598,6 @@
             'browser/sync/util/highres_timer_linux.h',
             'browser/sync/util/highres_timer_win.cc',
             'browser/sync/util/highres_timer_win.h',
-            'browser/sync/util/path_helpers.cc',
             'browser/sync/util/path_helpers.h',
             'browser/sync/util/path_helpers_linux.cc',
             'browser/sync/util/path_helpers_posix.cc',
@@ -6600,7 +6619,6 @@
             '<(protoc_out_dir)',
           ],
           'defines' : [
-            'COMPILER_MSVC',
             'COMPILING_SYNCAPI_LIBRARY',
             'SYNC_ENGINE_VERSION_STRING="Unknown"',
             '_CRT_SECURE_NO_WARNINGS',
@@ -6613,10 +6631,23 @@
           ],
           'conditions': [
             ['OS=="win"', {
+              'sources' : [
+                'browser/sync/util/data_encryption.cc',
+                'browser/sync/util/data_encryption.h',
+                'browser/sync/util/path_helpers.cc',
+              ],
+              'defines' : [
+                'COMPILER_MSVC',
+              ],
               'dependencies': [
                 '../third_party/pthreads-win32/pthreads.gyp:pthreads',
               ],
             }],
+            ['OS=="linux"', {
+              'defines': [
+                'POSIX',
+              ],
+            }],
           ],
         },
       ],  # targets when chrome_personalization==1 and use_syncapi_stub==0
-- 
cgit v1.1