diff options
| author | blundell <blundell@chromium.org> | 2016-03-18 01:15:26 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-18 08:16:58 +0000 |
| commit | 135b2ed3347a44635ae459396b4f7ab5c49849d9 (patch) | |
| tree | e0af920c4cc482ac1d02810124478c5b7611af4f /sync | |
| parent | dba3b6817d37e512d4722aa642353b7d48db1a7d (diff) | |
| download | chromium_src-135b2ed3347a44635ae459396b4f7ab5c49849d9.zip chromium_src-135b2ed3347a44635ae459396b4f7ab5c49849d9.tar.gz chromium_src-135b2ed3347a44635ae459396b4f7ab5c49849d9.tar.bz2 | |
Fix up dependency chain around net_features.h
//net exposes the generated net_features.h header as part of its public API
(e.g., via http_network_session.h). That means that the GYP build of //net
needs to export dependent settings on net_features.
Similarly, //sync exposes //net headers that transitively include
net_features.h via *its* public API (e.g., via http_bridge.h). This means that
//sync needs to export dependent settings on //net.
The GN build already gets this mostly right, so fewer fixes are needed there.
BUG=594970
Review URL: https://codereview.chromium.org/1811893002
Cr-Commit-Position: refs/heads/master@{#381910}
Diffstat (limited to 'sync')
| -rw-r--r-- | sync/BUILD.gn | 2 | ||||
| -rw-r--r-- | sync/sync.gyp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sync/BUILD.gn b/sync/BUILD.gn index 413f11c..6b39d6d 100644 --- a/sync/BUILD.gn +++ b/sync/BUILD.gn @@ -428,6 +428,7 @@ source_set("sync_core") { configs += [ "//build/config:precompiled_headers" ] public_deps = [ + "//net", "//sync/internal_api/attachments/proto", ] deps = [ @@ -436,7 +437,6 @@ source_set("sync_core") { "//base/third_party/dynamic_annotations", "//crypto", "//google_apis", - "//net", "//sql", "//sync/protocol", "//third_party/leveldatabase", diff --git a/sync/sync.gyp b/sync/sync.gyp index 6a5f3b1..b129936 100644 --- a/sync/sync.gyp +++ b/sync/sync.gyp @@ -31,6 +31,7 @@ 'sync_proto', ], 'export_dependent_settings': [ + 'sync_core', 'sync_proto', ], }, @@ -63,6 +64,7 @@ 'sync_proto', ], 'export_dependent_settings': [ + '../net/net.gyp:net', 'sync_proto', ], 'sources': [ |