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

Unified Diff: net/net.gyp

Issue 10874077: net: Add a new target 'net_with_v8'. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix7 Created 8 years, 4 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
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 27632fbd29d29fd9e1d10c643f406a7fe5008292..0a8cc926211d224e3a7a21ce2b870f1da2864f50 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -589,8 +589,6 @@
'proxy/proxy_resolver_script.h',
'proxy/proxy_resolver_script_data.cc',
'proxy/proxy_resolver_script_data.h',
- 'proxy/proxy_resolver_v8.cc',
- 'proxy/proxy_resolver_v8.h',
'proxy/proxy_resolver_winhttp.cc',
'proxy/proxy_resolver_winhttp.h',
'proxy/proxy_retry_info.h',
@@ -820,12 +818,6 @@
'../base/base.gyp:base',
],
'conditions': [
- ['OS != "ios"', {
- 'dependencies': [
- # The v8 gyp file is not available in the iOS tree.
- '../v8/tools/gyp/v8.gyp:v8',
- ],
- }],
['chromeos==1', {
'sources!': [
'base/network_change_notifier_linux.cc',
@@ -1122,6 +1114,27 @@
],
},
{
+ 'target_name': 'net_with_v8',
+ 'type': '<(component)',
+ 'variables': { 'enable_wexit_time_destructors': 1, },
+ 'dependencies': [ 'net' ],
+ 'sources': [
+ 'proxy/proxy_resolver_v8.cc',
+ 'proxy/proxy_resolver_v8.h',
+ 'proxy/proxy_service_with_v8.cc',
+ ],
+ 'conditions': [
+ ['OS != "ios"',
+ {
+ 'dependencies': [
+ # The v8 gyp file is not available in the iOS tree.
+ '../v8/tools/gyp/v8.gyp:v8',
+ ],
+ }
+ ],
+ ],
+ },
+ {
'target_name': 'net_unittests',
'type': '<(gtest_target_type)',
'dependencies': [
@@ -1132,8 +1145,8 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/zlib/zlib.gyp:zlib',
- 'net',
'net_test_support',
+ 'net_with_v8',
],
'sources': [
'base/address_list_unittest.cc',
@@ -1523,8 +1536,8 @@
'../base/base.gyp:test_support_perf',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../testing/gtest.gyp:gtest',
- 'net',
'net_test_support',
+ 'net_with_v8',
],
'sources': [
'cookies/cookie_monster_perftest.cc',
@@ -1559,7 +1572,7 @@
'../base/base.gyp:base',
'../base/base.gyp:test_support_base',
'../testing/gtest.gyp:gtest',
- 'net',
+ 'net_with_v8',
],
'export_dependent_settings': [
'../base/base.gyp:base',
@@ -1758,7 +1771,7 @@
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../testing/gtest.gyp:gtest',
- 'net',
+ 'net_with_v8',
],
'sources': [
'tools/fetch/fetch_client.cc',
@@ -1805,6 +1818,7 @@
'dependencies': [
'../base/base.gyp:base',
'net',
+ 'net_with_v8',
],
'sources': [
'tools/net_watcher/net_watcher.cc',
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | net/proxy/proxy_service.h » ('j') | net/proxy/proxy_service.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698