Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(925)

Unified Diff: chrome/chrome.gyp

Issue 199105: Continue with the FreeBSD port - this version builds and links, though... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/zygote_main_linux.cc ('k') | chrome/common/chrome_constants.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 25977)
+++ chrome/chrome.gyp (working copy)
@@ -627,7 +627,7 @@
'../app/app.gyp:app_base',
],
'conditions': [
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="freebsd"', {
'dependencies': [
'../build/linux/system.gyp:gtk',
],
@@ -641,7 +641,7 @@
'-lXext',
],
},
- }, { # else: 'OS!="linux"'
+ }, { # else: 'OS!="linux" and OS!="freebsd"'
'sources!': [
'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
],
@@ -2195,7 +2195,7 @@
['exclude', '^browser/chromeos'],
],
}],
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="freebsd"', {
'dependencies': [
# Temporarily disabled while we figure some stuff out.
# http://code.google.com/p/chromium/issues/detail?id=12351
@@ -2222,7 +2222,7 @@
'browser/net/ssl_config_service_manager_pref.cc',
],
'conditions': [
- ['linux_breakpad==1', {
+ ['OS=="linux" and linux_breakpad==1', {
'sources': [
'browser/renderer_host/render_crash_handler_host_linux.cc',
'app/breakpad_linux.cc',
@@ -2886,6 +2886,7 @@
'renderer/renderer_histogram_snapshots.h',
'renderer/renderer_main.cc',
'renderer/renderer_main_platform_delegate.h',
+ 'renderer/renderer_main_platform_delegate_freebsd.cc',
'renderer/renderer_main_platform_delegate_linux.cc',
'renderer/renderer_main_platform_delegate_mac.mm',
'renderer/renderer_main_platform_delegate_win.cc',
@@ -2917,7 +2918,22 @@
'dependencies': [
'../build/linux/system.gyp:gtk',
],
+ # You can't use 'sources!' here because the 'sources/' rules above
+ # are applied second and override the choices here.
+ 'sources/': [
+ [ 'exclude', '^renderer/renderer_main_platform_delegate_freebsd.cc$' ],
+ ],
}],
+ # FreeBSD-specific rules.
+ ['OS=="freebsd"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
+ ],
+ # You can't use 'sources!' here because the 'sources/' rules above
+ # are applied second and override the choices here.
+ 'sources/': [
+ [ 'exclude', '^renderer/renderer_main_platform_delegate_linux.cc$' ], ],
+ }],
# Windows-specific rules.
['OS=="win"', {
'include_dirs': [
@@ -2943,7 +2959,7 @@
'..',
],
'conditions': [
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="freebsd"', {
'dependencies': [
'../build/linux/system.gyp:gtk',
],
@@ -3635,7 +3651,7 @@
'test/ui_test_utils.h',
],
'conditions': [
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="freebsd"', {
'dependencies': [
'../build/linux/system.gyp:gtk',
],
@@ -3677,7 +3693,7 @@
'test/ui/ui_test_suite.h',
],
'conditions': [
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="freebsd"', {
'dependencies': [
'../build/linux/system.gyp:gtk',
],
@@ -3706,7 +3722,7 @@
'test/unit/run_all_unittests.cc',
],
'conditions': [
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="freebsd"', {
'dependencies': [
# Needed for the following #include chain:
# test/unit/run_all_unittests.cc
@@ -3819,7 +3835,7 @@
'worker/worker_uitest.cc',
],
'conditions': [
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="freebsd"', {
'dependencies': [
'../build/linux/system.gyp:gtk',
],
« no previous file with comments | « chrome/browser/zygote_main_linux.cc ('k') | chrome/common/chrome_constants.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698