OLD | NEW |
---|---|
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 888 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
899 'ENABLE_PERSISTENT_SESSION_COOKIES' | 899 'ENABLE_PERSISTENT_SESSION_COOKIES' |
900 ], | 900 ], |
901 }, { # else OS! = "android" | 901 }, { # else OS! = "android" |
902 'defines': [ | 902 'defines': [ |
903 # These are the features Android doesn't support. | 903 # These are the features Android doesn't support. |
904 'ENABLE_MEDIA_CODEC_THEORA', | 904 'ENABLE_MEDIA_CODEC_THEORA', |
905 'ENABLE_MEDIA_TYPE_OGG', | 905 'ENABLE_MEDIA_TYPE_OGG', |
906 ], | 906 ], |
907 }, | 907 }, |
908 ], | 908 ], |
909 [ 'OS == "linux"', { | |
910 'dependencies': [ | |
911 '../dbus/dbus.gyp:dbus', | |
satorux1
2011/10/13 06:58:05
I think you also need to update net/DEPS
adamk
2011/10/13 18:14:06
Done.
| |
912 ], | |
913 }, | |
914 ], | |
909 ], | 915 ], |
910 }, | 916 }, |
911 { | 917 { |
912 'target_name': 'net_unittests', | 918 'target_name': 'net_unittests', |
913 'type': 'executable', | 919 'type': 'executable', |
914 'dependencies': [ | 920 'dependencies': [ |
915 'net', | 921 'net', |
916 'net_test_support', | 922 'net_test_support', |
917 '../base/base.gyp:base', | 923 '../base/base.gyp:base', |
918 '../base/base.gyp:base_i18n', | 924 '../base/base.gyp:base_i18n', |
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1575 'tools/dump_cache/url_to_filename_encoder.cc', | 1581 'tools/dump_cache/url_to_filename_encoder.cc', |
1576 'tools/dump_cache/url_to_filename_encoder.h', | 1582 'tools/dump_cache/url_to_filename_encoder.h', |
1577 'tools/dump_cache/url_utilities.h', | 1583 'tools/dump_cache/url_utilities.h', |
1578 'tools/dump_cache/url_utilities.cc', | 1584 'tools/dump_cache/url_utilities.cc', |
1579 ], | 1585 ], |
1580 }, | 1586 }, |
1581 ], | 1587 ], |
1582 }], | 1588 }], |
1583 ], | 1589 ], |
1584 } | 1590 } |
OLD | NEW |