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

Side by Side Diff: net/net.gyp

Issue 10171009: Update net/android/network_library.cc with fresher code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: added comments, fixed caller Created 8 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'conditions': [ 10 'conditions': [
(...skipping 971 matching lines...) Expand 10 before | Expand all | Expand 10 after
982 [ 'OS == "android"', { 982 [ 'OS == "android"', {
983 'defines': [ 983 'defines': [
984 # Android can shut down our app at any time, so we persist session cookies. 984 # Android can shut down our app at any time, so we persist session cookies.
985 'ENABLE_PERSISTENT_SESSION_COOKIES' 985 'ENABLE_PERSISTENT_SESSION_COOKIES'
986 ], 986 ],
987 'dependencies': [ 987 'dependencies': [
988 '../build/android/system.gyp:ssl', 988 '../build/android/system.gyp:ssl',
989 'net_java', 989 'net_java',
990 'net_jni_headers', 990 'net_jni_headers',
991 ], 991 ],
992 'sources!': [
993 # TODO(jingzhao): The below files are excluded because of the
994 # missing JNI, add them back when JNI is ready.
995 'android/network_library.cc',
996 ],
997 }, { # else OS! = "android" 992 }, { # else OS! = "android"
998 'defines': [ 993 'defines': [
999 # These are the features Android doesn't support. 994 # These are the features Android doesn't support.
1000 'ENABLE_MEDIA_CODEC_THEORA', 995 'ENABLE_MEDIA_CODEC_THEORA',
1001 ], 996 ],
1002 }, 997 },
1003 ], 998 ],
1004 [ 'OS == "linux"', { 999 [ 'OS == "linux"', {
1005 'dependencies': [ 1000 'dependencies': [
1006 '../build/linux/system.gyp:dbus', 1001 '../build/linux/system.gyp:dbus',
(...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after
1796 }, 1791 },
1797 ] 1792 ]
1798 }], 1793 }],
1799 ['OS=="android"', { 1794 ['OS=="android"', {
1800 'targets': [ 1795 'targets': [
1801 { 1796 {
1802 'target_name': 'net_jni_headers', 1797 'target_name': 'net_jni_headers',
1803 'type': 'none', 1798 'type': 'none',
1804 'variables': { 1799 'variables': {
1805 'java_sources': [ 1800 'java_sources': [
1801 'android/java/org/chromium/net/AndroidNetworkLibrary.java',
1806 'android/java/org/chromium/net/NetworkChangeNotifier.java', 1802 'android/java/org/chromium/net/NetworkChangeNotifier.java',
1807 ], 1803 ],
1808 'jni_headers': [ 1804 'jni_headers': [
1805 '<(SHARED_INTERMEDIATE_DIR)/net/jni/android_network_library_jni.h' ,
1809 '<(SHARED_INTERMEDIATE_DIR)/net/jni/network_change_notifier_jni.h' , 1806 '<(SHARED_INTERMEDIATE_DIR)/net/jni/network_change_notifier_jni.h' ,
1810 ], 1807 ],
1811 }, 1808 },
1812 'includes': [ '../build/jni_generator.gypi' ], 1809 'includes': [ '../build/jni_generator.gypi' ],
1813 }, 1810 },
1814 { 1811 {
1815 'target_name': 'net_java', 1812 'target_name': 'net_java',
1816 'type': 'none', 1813 'type': 'none',
1817 'variables': { 1814 'variables': {
1818 'package_name': 'net', 1815 'package_name': 'net',
(...skipping 26 matching lines...) Expand all
1845 'tools/dump_cache/url_to_filename_encoder.cc', 1842 'tools/dump_cache/url_to_filename_encoder.cc',
1846 'tools/dump_cache/url_to_filename_encoder.h', 1843 'tools/dump_cache/url_to_filename_encoder.h',
1847 'tools/dump_cache/url_utilities.h', 1844 'tools/dump_cache/url_utilities.h',
1848 'tools/dump_cache/url_utilities.cc', 1845 'tools/dump_cache/url_utilities.cc',
1849 ], 1846 ],
1850 }, 1847 },
1851 ], 1848 ],
1852 }], 1849 }],
1853 ], 1850 ],
1854 } 1851 }
OLDNEW
« build/android/gtest_filter/net_unittests_disabled ('K') | « net/base/cert_verify_proc_openssl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698