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

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: fuck win - I hate you 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
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | net/proxy/proxy_resolver_v8.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 9c3c313c921740262f145f8db84cde46fbce3e08..056d13337f8c126e8852f318538414b991ac8c51 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -596,8 +596,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',
@@ -827,12 +825,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',
@@ -1152,6 +1144,35 @@
],
},
{
+ 'target_name': 'net_with_v8',
+ 'type': '<(component)',
+ 'variables': { 'enable_wexit_time_destructors': 1, },
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../build/temp_gyp/googleurl.gyp:googleurl',
+ 'net'
+ ],
+ 'defines': [
+ 'NET_IMPLEMENTATION',
+ ],
+ 'sources': [
+ 'proxy/proxy_resolver_v8.cc',
+ 'proxy/proxy_resolver_v8.h',
+ 'proxy/proxy_service_v8.cc',
+ 'proxy/proxy_service_v8.h',
+ ],
+ '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': [
@@ -1164,6 +1185,7 @@
'../third_party/zlib/zlib.gyp:zlib',
'net',
'net_test_support',
+ 'net_with_v8',
],
'sources': [
'base/address_list_unittest.cc',
@@ -1571,6 +1593,7 @@
'../testing/gtest.gyp:gtest',
'net',
'net_test_support',
+ 'net_with_v8',
],
'sources': [
'cookies/cookie_monster_perftest.cc',
@@ -1606,6 +1629,7 @@
'../base/base.gyp:test_support_base',
'../testing/gtest.gyp:gtest',
'net',
+ 'net_with_v8',
],
'export_dependent_settings': [
'../base/base.gyp:base',
@@ -1805,6 +1829,7 @@
'../build/temp_gyp/googleurl.gyp:googleurl',
'../testing/gtest.gyp:gtest',
'net',
+ 'net_with_v8',
],
'sources': [
'tools/fetch/fetch_client.cc',
@@ -1851,6 +1876,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_resolver_v8.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698