Chromium Code Reviews| 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 920 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 972 }, | 976 }, |
| 973 }, | 977 }, |
| 974 ], | 978 ], |
| 975 [ 'OS == "android"', { | 979 [ 'OS == "android"', { |
| 976 'defines': [ | 980 'defines': [ |
| 977 # Android can shut down our app at any time, so we persist session cookies. | 981 # Android can shut down our app at any time, so we persist session cookies. |
| 978 'ENABLE_PERSISTENT_SESSION_COOKIES' | 982 'ENABLE_PERSISTENT_SESSION_COOKIES' |
| 979 ], | 983 ], |
| 980 'dependencies': [ | 984 'dependencies': [ |
| 981 '../build/android/system.gyp:ssl', | 985 '../build/android/system.gyp:ssl', |
| 986 'android/java/java.gyp:net_java', | |
| 987 'net_jni_headers', | |
| 982 ], | 988 ], |
| 983 'sources/': [ | 989 'sources/': [ |
| 984 # TODO(jingzhao): The below files are excluded because of the | 990 # TODO(jingzhao): The below files are excluded because of the |
| 985 # missing JNI, add them back when JNI is ready. | 991 # missing JNI, add them back when JNI is ready. |
| 986 ['exclude', '^android/'], | 992 ['exclude', '^android/network_library'], |
| 987 ], | 993 ], |
| 988 }, { # else OS! = "android" | 994 }, { # else OS! = "android" |
| 989 'defines': [ | 995 'defines': [ |
| 990 # These are the features Android doesn't support. | 996 # These are the features Android doesn't support. |
| 991 'ENABLE_MEDIA_CODEC_THEORA', | 997 'ENABLE_MEDIA_CODEC_THEORA', |
| 992 ], | 998 ], |
| 993 }, | 999 }, |
| 994 ], | 1000 ], |
| 995 [ 'OS == "linux"', { | 1001 [ 'OS == "linux"', { |
| 996 'dependencies': [ | 1002 'dependencies': [ |
| (...skipping 782 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1779 '../third_party/zlib/zlib.gyp:zlib', | 1785 '../third_party/zlib/zlib.gyp:zlib', |
| 1780 ], | 1786 ], |
| 1781 'sources': [ | 1787 'sources': [ |
| 1782 'curvecp/curvecp_transfer_unittest.cc', | 1788 'curvecp/curvecp_transfer_unittest.cc', |
| 1783 'curvecp/test_client.cc', | 1789 'curvecp/test_client.cc', |
| 1784 'curvecp/test_server.cc', | 1790 'curvecp/test_server.cc', |
| 1785 ], | 1791 ], |
| 1786 }, | 1792 }, |
| 1787 ] | 1793 ] |
| 1788 }], | 1794 }], |
| 1795 ['OS=="android"', { | |
| 1796 'targets': [ | |
| 1797 { | |
| 1798 'target_name': 'net_jni_headers', | |
| 1799 'type': 'none', | |
| 1800 'actions': [ | |
| 1801 { | |
| 1802 'action_name': 'generate_jni_headers', | |
| 1803 'inputs': [ | |
| 1804 '<(DEPTH)/base/android/jni_generator/jni_generator.py', | |
| 1805 'android/java/org/chromium/net/NetworkChangeNotifier.java', | |
| 1806 ], | |
| 1807 'outputs': [ | |
| 1808 '<(SHARED_INTERMEDIATE_DIR)/net/jni/network_change_notifier_jni. h', | |
| 1809 ], | |
| 1810 'action': [ | |
| 1811 'python', | |
| 1812 '<(DEPTH)/base/android/jni_generator/jni_generator.py', | |
| 1813 '-o', | |
| 1814 '<@(_inputs)', | |
| 1815 '<@(_outputs)', | |
|
Ryan Sleevi
2012/04/13 22:37:58
Please consider using jni_generator.gypi, as menti
Yaron
2012/04/17 16:18:03
Done.
| |
| 1816 ], | |
| 1817 }, | |
| 1818 ], | |
| 1819 } | |
| 1820 ], | |
| 1821 }], | |
| 1789 ['OS=="win"', { | 1822 ['OS=="win"', { |
| 1790 'targets': [ | 1823 'targets': [ |
| 1791 { | 1824 { |
| 1792 # TODO(port): dump_cache is still Windows-specific. | 1825 # TODO(port): dump_cache is still Windows-specific. |
| 1793 'target_name': 'dump_cache', | 1826 'target_name': 'dump_cache', |
| 1794 'type': 'executable', | 1827 'type': 'executable', |
| 1795 'dependencies': [ | 1828 'dependencies': [ |
| 1796 'net', | 1829 'net', |
| 1797 'net_test_support', | 1830 'net_test_support', |
| 1798 '../base/base.gyp:base', | 1831 '../base/base.gyp:base', |
| 1799 ], | 1832 ], |
| 1800 'sources': [ | 1833 'sources': [ |
| 1801 'tools/dump_cache/cache_dumper.cc', | 1834 'tools/dump_cache/cache_dumper.cc', |
| 1802 'tools/dump_cache/cache_dumper.h', | 1835 'tools/dump_cache/cache_dumper.h', |
| 1803 'tools/dump_cache/dump_cache.cc', | 1836 'tools/dump_cache/dump_cache.cc', |
| 1804 'tools/dump_cache/dump_files.cc', | 1837 'tools/dump_cache/dump_files.cc', |
| 1805 'tools/dump_cache/upgrade.cc', | 1838 'tools/dump_cache/upgrade.cc', |
| 1806 'tools/dump_cache/url_to_filename_encoder.cc', | 1839 'tools/dump_cache/url_to_filename_encoder.cc', |
| 1807 'tools/dump_cache/url_to_filename_encoder.h', | 1840 'tools/dump_cache/url_to_filename_encoder.h', |
| 1808 'tools/dump_cache/url_utilities.h', | 1841 'tools/dump_cache/url_utilities.h', |
| 1809 'tools/dump_cache/url_utilities.cc', | 1842 'tools/dump_cache/url_utilities.cc', |
| 1810 ], | 1843 ], |
| 1811 }, | 1844 }, |
| 1812 ], | 1845 ], |
| 1813 }], | 1846 }], |
| 1814 ], | 1847 ], |
| 1815 } | 1848 } |
| OLD | NEW |