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

Unified Diff: net/net.gyp

Issue 903273002: Update from https://crrev.com/315085 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « net/interfaces/proxy_resolver_service.mojom ('k') | net/net.gypi » ('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 834a4c62e8ec5a33132f43f95c1ad541827b55e9..cd381e02a135169140e729d5044e8c3d29b2c6ce 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -837,6 +837,7 @@
'cookies/cookie_monster_perftest.cc',
'disk_cache/blockfile/disk_cache_perftest.cc',
'proxy/proxy_resolver_perftest.cc',
+ 'udp/udp_socket_perftest.cc',
'websockets/websocket_frame_perftest.cc',
],
'conditions': [
@@ -1203,6 +1204,22 @@
},
],
}],
+ ['use_v8_in_net == 1 and OS != "android"', {
+ 'targets': [
+ {
+ # GN version: //net/interfaces
+ 'target_name': 'net_interfaces',
+ 'type': 'static_library',
+ 'sources': [
+ 'interfaces/host_resolver_service.mojom',
+ 'interfaces/proxy_resolver_service.mojom',
+ ],
+ 'includes': [
+ '../third_party/mojo/mojom_bindings_generator.gypi',
+ ],
+ },
+ ],
+ }],
['OS != "ios" and OS != "android"', {
'targets': [
# iOS doesn't have the concept of simple executables, these targets
« no previous file with comments | « net/interfaces/proxy_resolver_service.mojom ('k') | net/net.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698