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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/net.gyp

Issue 11191047: Upstream Android-specific net/ changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 2 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/android/tools/proxy_test_cases.py ('k') | net/proxy/proxy_config_service_android.h » ('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 10c9c0a52a47279843587ae5511cf1638ad81add..e1e78e267d53ecbafb703ace4ac86d434631da80 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1461,6 +1461,13 @@
'proxy/proxy_config_service_linux_unittest.cc',
],
}],
+ [ 'OS == "android"', {
+ 'sources!': [
+ # No res_ninit() et al on Android, so this doesn't make a lot of
+ # sense.
+ 'dns/dns_config_service_posix_unittest.cc',
+ ],
+ }],
[ 'use_glib == 1', {
'dependencies': [
'../build/linux/system.gyp:ssl',
« no previous file with comments | « net/android/tools/proxy_test_cases.py ('k') | net/proxy/proxy_config_service_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698