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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome.gyp

Issue 112068: chrome.gyp fixes to preserve various build behaviors... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 17127)
+++ chrome/chrome.gyp (working copy)
@@ -17,6 +17,7 @@
'../printing/printing.gyp:printing',
'../webkit/webkit.gyp:inspector_resources',
],
+ 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
},
'includes': [
'../build/common.gypi',
@@ -169,7 +170,6 @@
'type': 'none',
'variables': {
'grit_path': '../tools/grit/grit.py',
- 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
},
'actions': [
{
@@ -422,6 +422,9 @@
'common/x11_util.h',
'common/x11_util_internal.h',
'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
+
+ 'tools/build/win/precompiled.cc',
+ 'tools/build/win/precompiled.h',
],
'direct_dependent_settings': {
'include_dirs': [
@@ -431,6 +434,12 @@
'export_dependent_settings': [
'../app/app.gyp:app_base',
],
+ 'configurations': {
+ 'Debug': {
+ 'msvs_precompiled_header': 'tools/build/win/precompiled.h',
+ 'msvs_precompiled_source': 'tools/build/win/precompiled.cc',
+ },
+ },
'conditions': [
['OS=="linux"', {
'dependencies': [
@@ -1853,7 +1862,16 @@
'plugin/webplugin_delegate_stub.h',
'plugin/webplugin_proxy.cc',
'plugin/webplugin_proxy.h',
+
+ 'tools/build/win/precompiled.cc',
+ 'tools/build/win/precompiled.h',
],
+ 'configurations': {
+ 'Debug': {
+ 'msvs_precompiled_header': 'tools/build/win/precompiled.h',
+ 'msvs_precompiled_source': 'tools/build/win/precompiled.cc',
+ },
+ },
# These are layered in conditionals in the event other platforms
# end up using this module as well.
'conditions': [
@@ -1973,12 +1991,21 @@
'renderer/webplugin_delegate_proxy.h',
'renderer/webworker_proxy.cc',
'renderer/webworker_proxy.h',
+
+ 'tools/build/win/precompiled_wtl.cc',
+ 'tools/build/win/precompiled_wtl.h',
],
'link_settings': {
'mac_bundle_resources': [
'renderer/renderer.sb',
],
},
+ 'configurations': {
+ 'Debug': {
+ 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
+ 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
+ },
+ },
'conditions': [
# Linux-specific rules.
['OS=="linux"', {
@@ -2881,9 +2908,11 @@
'chrome_strings',
'test_support_unit',
'../app/app.gyp:app_resources',
+ '../net/net.gyp:net_resources',
'../net/net.gyp:net_test_support',
'../printing/printing.gyp:printing',
'../webkit/webkit.gyp:webkit',
+ '../webkit/webkit.gyp:webkit_resources',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
'../third_party/icu38/icu38.gyp:icui18n',
@@ -3003,6 +3032,8 @@
'browser/net/dns_host_info_unittest.cc',
'browser/net/dns_master_unittest.cc',
'browser/net/resolve_proxy_msg_helper_unittest.cc',
+ 'browser/net/test_url_fetcher_factory.cc',
+ 'browser/net/test_url_fetcher_factory.h',
'browser/net/url_fetcher_unittest.cc',
'browser/net/url_fixer_upper_unittest.cc',
'browser/password_manager/encryptor_unittest.cc',
@@ -3099,6 +3130,9 @@
'../views/focus/focus_manager_unittest.cc',
'../views/grid_layout_unittest.cc',
'../views/view_unittest.cc',
+
+ 'tools/build/win/precompiled_wtl.h',
+ 'tools/build/win/precompiled_wtl.cc',
],
'conditions': [
['OS=="linux"', {
@@ -3163,6 +3197,8 @@
],
'configurations': {
'Debug': {
+ 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
+ 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
'msvs_settings': {
'VCLinkerTool': {
'LinkIncremental': '1', # /INCREMENTAL:NO
@@ -3253,6 +3289,7 @@
'app',
'chrome_resources',
'chrome_strings',
+ 'test_support_common',
'test_support_ui',
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
@@ -3455,6 +3492,7 @@
'type': 'none',
'dependencies': [
'app/locales.gyp:*',
+ 'installer/installer.gyp:*',
'../app/app.gyp:*',
'../base/base.gyp:*',
'../media/media.gyp:*',
@@ -3813,6 +3851,7 @@
'test_support_common',
'test_support_ui',
'third_party/hunspell/hunspell.gyp:hunspell',
+ '../net/net.gyp:net_resources',
'../skia/skia.gyp:skia',
'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
'../third_party/icu38/icu38.gyp:icui18n',
@@ -3822,6 +3861,7 @@
'../testing/gtest.gyp:gtest',
'../third_party/npapi/npapi.gyp:npapi',
'../views/views.gyp:views',
+ '../webkit/webkit.gyp:webkit_resources',
],
'include_dirs': [
'..',
@@ -4034,15 +4074,26 @@
'test_support_common',
'test_support_ui',
'theme_resources',
+ '../net/net.gyp:net',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
],
'include_dirs': [
'..',
+ 'third_party/wtl/include',
],
'sources': [
'test/url_fetch_test/url_fetch_test.cc',
+
+ 'tools/build/win/precompiled_wtl.cc',
+ 'tools/build/win/precompiled_wtl.h',
],
+ 'configurations': {
+ 'Debug': {
+ 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
+ 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
+ },
+ },
},
{
'target_name': 'worker',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698