| OLD | NEW |
| 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 21 matching lines...) Expand all Loading... |
| 32 '../build/temp_gyp/googleurl.gyp:googleurl', | 32 '../build/temp_gyp/googleurl.gyp:googleurl', |
| 33 '../crypto/crypto.gyp:crypto', | 33 '../crypto/crypto.gyp:crypto', |
| 34 '../sdch/sdch.gyp:sdch', | 34 '../sdch/sdch.gyp:sdch', |
| 35 '../third_party/icu/icu.gyp:icui18n', | 35 '../third_party/icu/icu.gyp:icui18n', |
| 36 '../third_party/icu/icu.gyp:icuuc', | 36 '../third_party/icu/icu.gyp:icuuc', |
| 37 '../third_party/zlib/zlib.gyp:zlib', | 37 '../third_party/zlib/zlib.gyp:zlib', |
| 38 '../v8/tools/gyp/v8.gyp:v8', | 38 '../v8/tools/gyp/v8.gyp:v8', |
| 39 'net_resources', | 39 'net_resources', |
| 40 ], | 40 ], |
| 41 'sources': [ | 41 'sources': [ |
| 42 'android/network_change_notifier.cc', |
| 43 'android/network_change_notifier.h', |
| 44 'android/network_change_notifier_factory.cc', |
| 45 'android/network_change_notifier_factory.h', |
| 42 'android/network_library.cc', | 46 'android/network_library.cc', |
| 43 'android/network_library.h', | 47 'android/network_library.h', |
| 44 'base/address_family.h', | 48 'base/address_family.h', |
| 45 'base/address_list.cc', | 49 'base/address_list.cc', |
| 46 'base/address_list.h', | 50 'base/address_list.h', |
| 47 'base/address_list_net_log_param.cc', | 51 'base/address_list_net_log_param.cc', |
| 48 'base/address_list_net_log_param.h', | 52 'base/address_list_net_log_param.h', |
| 49 'base/asn1_util.cc', | 53 'base/asn1_util.cc', |
| 50 'base/asn1_util.h', | 54 'base/asn1_util.h', |
| 51 'base/auth.cc', | 55 'base/auth.cc', |
| (...skipping 923 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 975 }, | 979 }, |
| 976 }, | 980 }, |
| 977 ], | 981 ], |
| 978 [ 'OS == "android"', { | 982 [ 'OS == "android"', { |
| 979 'defines': [ | 983 'defines': [ |
| 980 # 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. |
| 981 'ENABLE_PERSISTENT_SESSION_COOKIES' | 985 'ENABLE_PERSISTENT_SESSION_COOKIES' |
| 982 ], | 986 ], |
| 983 'dependencies': [ | 987 'dependencies': [ |
| 984 '../build/android/system.gyp:ssl', | 988 '../build/android/system.gyp:ssl', |
| 989 'net_java', |
| 990 'net_jni_headers', |
| 985 ], | 991 ], |
| 986 'sources/': [ | 992 'sources!': [ |
| 987 # TODO(jingzhao): The below files are excluded because of the | 993 # TODO(jingzhao): The below files are excluded because of the |
| 988 # missing JNI, add them back when JNI is ready. | 994 # missing JNI, add them back when JNI is ready. |
| 989 ['exclude', '^android/'], | 995 'android/network_library.cc', |
| 990 ], | 996 ], |
| 991 }, { # else OS! = "android" | 997 }, { # else OS! = "android" |
| 992 'defines': [ | 998 'defines': [ |
| 993 # These are the features Android doesn't support. | 999 # These are the features Android doesn't support. |
| 994 'ENABLE_MEDIA_CODEC_THEORA', | 1000 'ENABLE_MEDIA_CODEC_THEORA', |
| 995 ], | 1001 ], |
| 996 }, | 1002 }, |
| 997 ], | 1003 ], |
| 998 [ 'OS == "linux"', { | 1004 [ 'OS == "linux"', { |
| 999 'dependencies': [ | 1005 'dependencies': [ |
| (...skipping 783 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1783 '../third_party/zlib/zlib.gyp:zlib', | 1789 '../third_party/zlib/zlib.gyp:zlib', |
| 1784 ], | 1790 ], |
| 1785 'sources': [ | 1791 'sources': [ |
| 1786 'curvecp/curvecp_transfer_unittest.cc', | 1792 'curvecp/curvecp_transfer_unittest.cc', |
| 1787 'curvecp/test_client.cc', | 1793 'curvecp/test_client.cc', |
| 1788 'curvecp/test_server.cc', | 1794 'curvecp/test_server.cc', |
| 1789 ], | 1795 ], |
| 1790 }, | 1796 }, |
| 1791 ] | 1797 ] |
| 1792 }], | 1798 }], |
| 1799 ['OS=="android"', { |
| 1800 'targets': [ |
| 1801 { |
| 1802 'target_name': 'net_jni_headers', |
| 1803 'type': 'none', |
| 1804 'variables': { |
| 1805 'java_sources': [ |
| 1806 'android/java/org/chromium/net/NetworkChangeNotifier.java', |
| 1807 ], |
| 1808 'jni_headers': [ |
| 1809 '<(SHARED_INTERMEDIATE_DIR)/net/jni/network_change_notifier_jni.h'
, |
| 1810 ], |
| 1811 }, |
| 1812 'includes': [ '../build/jni_generator.gypi' ], |
| 1813 }, |
| 1814 { |
| 1815 'target_name': 'net_java', |
| 1816 'type': 'none', |
| 1817 'variables': { |
| 1818 'package_name': 'net', |
| 1819 'java_in_dir': '../net/android/java', |
| 1820 }, |
| 1821 'dependencies': [ |
| 1822 '../base/base.gyp:base_java', |
| 1823 ], |
| 1824 'includes': [ '../build/java.gypi' ], |
| 1825 }, |
| 1826 ], |
| 1827 }], |
| 1793 ['OS=="win"', { | 1828 ['OS=="win"', { |
| 1794 'targets': [ | 1829 'targets': [ |
| 1795 { | 1830 { |
| 1796 # TODO(port): dump_cache is still Windows-specific. | 1831 # TODO(port): dump_cache is still Windows-specific. |
| 1797 'target_name': 'dump_cache', | 1832 'target_name': 'dump_cache', |
| 1798 'type': 'executable', | 1833 'type': 'executable', |
| 1799 'dependencies': [ | 1834 'dependencies': [ |
| 1800 'net', | 1835 'net', |
| 1801 'net_test_support', | 1836 'net_test_support', |
| 1802 '../base/base.gyp:base', | 1837 '../base/base.gyp:base', |
| 1803 ], | 1838 ], |
| 1804 'sources': [ | 1839 'sources': [ |
| 1805 'tools/dump_cache/cache_dumper.cc', | 1840 'tools/dump_cache/cache_dumper.cc', |
| 1806 'tools/dump_cache/cache_dumper.h', | 1841 'tools/dump_cache/cache_dumper.h', |
| 1807 'tools/dump_cache/dump_cache.cc', | 1842 'tools/dump_cache/dump_cache.cc', |
| 1808 'tools/dump_cache/dump_files.cc', | 1843 'tools/dump_cache/dump_files.cc', |
| 1809 'tools/dump_cache/upgrade.cc', | 1844 'tools/dump_cache/upgrade.cc', |
| 1810 'tools/dump_cache/url_to_filename_encoder.cc', | 1845 'tools/dump_cache/url_to_filename_encoder.cc', |
| 1811 'tools/dump_cache/url_to_filename_encoder.h', | 1846 'tools/dump_cache/url_to_filename_encoder.h', |
| 1812 'tools/dump_cache/url_utilities.h', | 1847 'tools/dump_cache/url_utilities.h', |
| 1813 'tools/dump_cache/url_utilities.cc', | 1848 'tools/dump_cache/url_utilities.cc', |
| 1814 ], | 1849 ], |
| 1815 }, | 1850 }, |
| 1816 ], | 1851 ], |
| 1817 }], | 1852 }], |
| 1818 ], | 1853 ], |
| 1819 } | 1854 } |
| OLD | NEW |