Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 'use_tracing_cache_backend%': 0, | 10 'use_tracing_cache_backend%': 0, |
| (...skipping 26 matching lines...) Expand all Loading... | |
| 37 'use_v8_in_net%': 1, | 37 'use_v8_in_net%': 1, |
| 38 'enable_built_in_dns%': 1, | 38 'enable_built_in_dns%': 1, |
| 39 }], | 39 }], |
| 40 ], | 40 ], |
| 41 }, | 41 }, |
| 42 'includes': [ | 42 'includes': [ |
| 43 '../build/win_precompile.gypi', | 43 '../build/win_precompile.gypi', |
| 44 ], | 44 ], |
| 45 'targets': [ | 45 'targets': [ |
| 46 { | 46 { |
| 47 'target_name': 'net_derived_sources', | |
| 48 'type': 'none', | |
| 49 'sources': [ | |
| 50 'base/registry_controlled_domains/effective_tld_names.gperf', | |
| 51 'base/registry_controlled_domains/effective_tld_names_unittest1.gperf', | |
| 52 'base/registry_controlled_domains/effective_tld_names_unittest2.gperf', | |
| 53 'base/registry_controlled_domains/effective_tld_names_unittest3.gperf', | |
| 54 'base/registry_controlled_domains/effective_tld_names_unittest4.gperf', | |
| 55 'base/registry_controlled_domains/effective_tld_names_unittest5.gperf', | |
| 56 'base/registry_controlled_domains/effective_tld_names_unittest6.gperf', | |
| 57 ], | |
| 58 'rules': [ | |
| 59 { | |
| 60 'rule_name': 'dafsa', | |
| 61 'extension': 'gperf', | |
| 62 'outputs': [ | |
| 63 '<(SHARED_INTERMEDIATE_DIR)/net/<(RULE_INPUT_ROOT)-inc.cc', | |
| 64 ], | |
| 65 'inputs': [ | |
| 66 'tools/tld_cleanup/make_dafsa.py', | |
| 67 ], | |
| 68 'action': [ | |
| 69 'python', | |
| 70 'tools/tld_cleanup/make_dafsa.py', | |
| 71 '<(RULE_INPUT_PATH)', | |
| 72 '<(SHARED_INTERMEDIATE_DIR)/net/<(RULE_INPUT_ROOT)-inc.cc', | |
| 73 ], | |
| 74 }, | |
| 75 ], | |
| 76 }, | |
| 77 { | |
| 47 'target_name': 'net', | 78 'target_name': 'net', |
|
Ryan Sleevi
2014/04/23 01:52:18
You didn't seem to add <(SHARED_INTERMEDIATE_DIR)/
Olle Liljenzin
2014/04/24 09:30:00
It looks like this include path is added to net by
| |
| 48 'type': '<(component)', | 79 'type': '<(component)', |
| 49 'variables': { 'enable_wexit_time_destructors': 1, }, | 80 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 50 'dependencies': [ | 81 'dependencies': [ |
| 51 '../base/base.gyp:base', | 82 '../base/base.gyp:base', |
| 52 '../base/base.gyp:base_i18n', | 83 '../base/base.gyp:base_i18n', |
| 53 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', | 84 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', |
| 54 '../crypto/crypto.gyp:crypto', | 85 '../crypto/crypto.gyp:crypto', |
| 55 '../sdch/sdch.gyp:sdch', | 86 '../sdch/sdch.gyp:sdch', |
| 56 '../third_party/icu/icu.gyp:icui18n', | 87 '../third_party/icu/icu.gyp:icui18n', |
| 57 '../third_party/icu/icu.gyp:icuuc', | 88 '../third_party/icu/icu.gyp:icuuc', |
| 58 '../third_party/zlib/zlib.gyp:zlib', | 89 '../third_party/zlib/zlib.gyp:zlib', |
| 59 '../url/url.gyp:url_lib', | 90 '../url/url.gyp:url_lib', |
| 60 'net_resources', | 91 'net_resources', |
| 92 'net_derived_sources', | |
| 61 ], | 93 ], |
| 62 'sources': [ | 94 'sources': [ |
| 63 'android/cert_verify_result_android.cc', | 95 'android/cert_verify_result_android.cc', |
| 64 'android/cert_verify_result_android.h', | 96 'android/cert_verify_result_android.h', |
| 65 'android/cert_verify_status_android_list.h', | 97 'android/cert_verify_status_android_list.h', |
| 66 'android/gurl_utils.cc', | 98 'android/gurl_utils.cc', |
| 67 'android/gurl_utils.h', | 99 'android/gurl_utils.h', |
| 68 'android/android_private_key.cc', | 100 'android/android_private_key.cc', |
| 69 'android/android_private_key.h', | 101 'android/android_private_key.h', |
| 70 'android/keystore.cc', | 102 'android/keystore.cc', |
| (...skipping 1572 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1643 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', | 1675 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', |
| 1644 '../crypto/crypto.gyp:crypto', | 1676 '../crypto/crypto.gyp:crypto', |
| 1645 '../testing/gmock.gyp:gmock', | 1677 '../testing/gmock.gyp:gmock', |
| 1646 '../testing/gtest.gyp:gtest', | 1678 '../testing/gtest.gyp:gtest', |
| 1647 '../third_party/zlib/zlib.gyp:zlib', | 1679 '../third_party/zlib/zlib.gyp:zlib', |
| 1648 '../url/url.gyp:url_lib', | 1680 '../url/url.gyp:url_lib', |
| 1649 'http_server', | 1681 'http_server', |
| 1650 'net', | 1682 'net', |
| 1651 'net_test_support' | 1683 'net_test_support' |
| 1652 ], | 1684 ], |
| 1685 'include_dirs': [ | |
| 1686 '<(SHARED_INTERMEDIATE_DIR)/net', | |
|
Ryan Sleevi
2014/04/23 01:52:18
Unnecessary, right?
Olle Liljenzin
2014/04/24 09:30:00
Necessary unless there is a better way to add the
| |
| 1687 ], | |
| 1653 'sources': [ | 1688 'sources': [ |
| 1654 'android/keystore_unittest.cc', | 1689 'android/keystore_unittest.cc', |
| 1655 'android/network_change_notifier_android_unittest.cc', | 1690 'android/network_change_notifier_android_unittest.cc', |
| 1656 'base/address_list_unittest.cc', | 1691 'base/address_list_unittest.cc', |
| 1657 'base/address_tracker_linux_unittest.cc', | 1692 'base/address_tracker_linux_unittest.cc', |
| 1658 'base/backoff_entry_unittest.cc', | 1693 'base/backoff_entry_unittest.cc', |
| 1659 'base/data_url_unittest.cc', | 1694 'base/data_url_unittest.cc', |
| 1660 'base/directory_lister_unittest.cc', | 1695 'base/directory_lister_unittest.cc', |
| 1661 'base/dns_util_unittest.cc', | 1696 'base/dns_util_unittest.cc', |
| 1662 'base/escape_unittest.cc', | 1697 'base/escape_unittest.cc', |
| (...skipping 1560 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3223 'net_unittests.isolate', | 3258 'net_unittests.isolate', |
| 3224 ], | 3259 ], |
| 3225 'sources': [ | 3260 'sources': [ |
| 3226 'net_unittests.isolate', | 3261 'net_unittests.isolate', |
| 3227 ], | 3262 ], |
| 3228 }, | 3263 }, |
| 3229 ], | 3264 ], |
| 3230 }], | 3265 }], |
| 3231 ], | 3266 ], |
| 3232 } | 3267 } |
| OLD | NEW |