Index: net/net.gyp |
diff --git a/net/net.gyp b/net/net.gyp |
index 3db83b5fa0dbcf3c6a0b65a37182690cb9117bfb..80fd8a69c2da69e4e3cde2a7e036abb0b2db3b82 100644 |
--- a/net/net.gyp |
+++ b/net/net.gyp |
@@ -5,7 +5,9 @@ |
{ |
'variables': { |
'chromium_code': 1, |
- |
+ # Defines an extra set of libs with an alternate copy of org.apache.http. |
+ # TODO(yfriedman): Remove this when crbug.com/488192 is fixed. |
+ 'net_test_extra_libs': [], |
'linux_link_kerberos%': 0, |
'conditions': [ |
['chromeos==1 or embedded==1 or OS=="android" or OS=="ios"', { |
@@ -1400,7 +1402,8 @@ |
}, |
'dependencies': [ |
'url_request_failed_job_java', |
- '../base/base.gyp:base_java' |
+ '../base/base.gyp:base_java', |
+ '<@(net_test_extra_libs)', |
], |
'includes': [ '../build/java.gypi' ], |
}, |