Chromium Code Reviews| Index: net/net.gyp |
| diff --git a/net/net.gyp b/net/net.gyp |
| index efdeda38cf84090ce01e3a50323b938380f9cee4..9626326618ce50167ea81e57122ca31f8f6cb106 100644 |
| --- a/net/net.gyp |
| +++ b/net/net.gyp |
| @@ -44,6 +44,37 @@ |
| ], |
| 'targets': [ |
| { |
| + 'target_name': 'net_derived_sources', |
| + 'type': 'none', |
| + 'sources': [ |
| + 'base/registry_controlled_domains/effective_tld_names.gperf', |
| + 'base/registry_controlled_domains/effective_tld_names_unittest1.gperf', |
| + 'base/registry_controlled_domains/effective_tld_names_unittest2.gperf', |
| + 'base/registry_controlled_domains/effective_tld_names_unittest3.gperf', |
| + 'base/registry_controlled_domains/effective_tld_names_unittest4.gperf', |
| + 'base/registry_controlled_domains/effective_tld_names_unittest5.gperf', |
| + 'base/registry_controlled_domains/effective_tld_names_unittest6.gperf', |
| + ], |
| + 'rules': [ |
| + { |
| + 'rule_name': 'dafsa', |
| + 'extension': 'gperf', |
| + 'outputs': [ |
| + '<(SHARED_INTERMEDIATE_DIR)/net/<(RULE_INPUT_ROOT)-inc.cc', |
| + ], |
| + 'inputs': [ |
| + 'tools/tld_cleanup/make_dafsa.py', |
| + ], |
| + 'action': [ |
| + 'python', |
| + 'tools/tld_cleanup/make_dafsa.py', |
| + '<(RULE_INPUT_PATH)', |
| + '<(SHARED_INTERMEDIATE_DIR)/net/<(RULE_INPUT_ROOT)-inc.cc', |
| + ], |
| + }, |
| + ], |
| + }, |
| + { |
| '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
|
| 'type': '<(component)', |
| 'variables': { 'enable_wexit_time_destructors': 1, }, |
| @@ -58,6 +89,7 @@ |
| '../third_party/zlib/zlib.gyp:zlib', |
| '../url/url.gyp:url_lib', |
| 'net_resources', |
| + 'net_derived_sources', |
| ], |
| 'sources': [ |
| 'android/cert_verify_result_android.cc', |
| @@ -1650,6 +1682,9 @@ |
| 'net', |
| 'net_test_support' |
| ], |
| + 'include_dirs': [ |
| + '<(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
|
| + ], |
| 'sources': [ |
| 'android/keystore_unittest.cc', |
| 'android/network_change_notifier_android_unittest.cc', |