diff options
| author | xunjieli <xunjieli@chromium.org> | 2015-08-27 10:13:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-27 17:13:53 +0000 |
| commit | 06d9398786c3029299ce99e2da081c038859f534 (patch) | |
| tree | b88bdbd89a9dc26119f6c14f46b4f5a43614b29d /net/net_common.gypi | |
| parent | b50ad70d3243979e42fe667a9b9e26bd1910eba9 (diff) | |
| download | chromium_src-06d9398786c3029299ce99e2da081c038859f534.zip chromium_src-06d9398786c3029299ce99e2da081c038859f534.tar.gz chromium_src-06d9398786c3029299ce99e2da081c038859f534.tar.bz2 | |
Revert of Make separate net and url GN targets with and without ICU (patchset #8 id:300001 of https://codereview.chromium.org/1287893005/ )
Reason for revert:
This CL broke a GN check on an internal bot:
https://uberchromegw.corp.google.com/i/chromium.linux/builders/Android%20GN/builds/29756
Running ['/b/build/slave/Android_GN/build/src/buildtools/linux64/gn', '--root=/b/build/slave/Android_GN/build/src', 'check', '//out/Release']
ERROR at //url/android/url_jni_registrar.cc:8:11: Include not allowed.
#include "url/url_canon_icu_alternatives_android.h"
^---------------------------------------
It is not in any dependency of
//url:url
The include file is in the target(s):
//url:url_lib_use_icu_alternatives_on_android
which should somehow be reachable.
Command ['/b/build/slave/Android_GN/build/src/buildtools/linux64/gn', '--root=/b/build/slave/Android_GN/build/src', 'check', '//out/Release'] returned exit code 1
Original issue's description:
> Make separate net and url GN targets with and without ICU
>
> The net and url GYP files were modified in crrev.com/933293003
> so Cronet could be built side-by-side with Chrome. However GN
> files are not modified. This CL keeps the GN files in sync
> with the GYP files.
>
> BUG=522096
>
> Committed: https://crrev.com/4c8c6921ca6739d16f6551635328faf164848f9d
> Cr-Commit-Position: refs/heads/master@{#345891}
TBR=mmenke@chromium.org,brettw@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=522096
Review URL: https://codereview.chromium.org/1312583006
Cr-Commit-Position: refs/heads/master@{#345906}
Diffstat (limited to 'net/net_common.gypi')
| -rw-r--r-- | net/net_common.gypi | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/net/net_common.gypi b/net/net_common.gypi index d029591..0a1a4ed 100644 --- a/net/net_common.gypi +++ b/net/net_common.gypi @@ -86,14 +86,31 @@ 'disk_cache/blockfile/mapped_file_avoid_mmap_posix.cc', ], }], - ['disable_file_support!=1', { + ['disable_file_support==1', { # TODO(mmenke): Should probably get rid of the dependency on # net_resources in this case (It's used in net_util, to format # directory listings. Also used outside of net/). - 'sources': ['<@(net_file_support_sources)'] + 'sources!': [ + 'base/directory_lister.cc', + 'base/directory_lister.h', + 'url_request/file_protocol_handler.cc', + 'url_request/file_protocol_handler.h', + 'url_request/url_request_file_dir_job.cc', + 'url_request/url_request_file_dir_job.h', + 'url_request/url_request_file_job.cc', + 'url_request/url_request_file_job.h', + ], }], - ['disable_ftp_support!=1', { - 'sources': ['<@(net_ftp_support_sources)'] + ['disable_ftp_support==1', { + 'sources/': [ + ['exclude', '^ftp/'], + ], + 'sources!': [ + 'url_request/ftp_protocol_handler.cc', + 'url_request/ftp_protocol_handler.h', + 'url_request/url_request_ftp_job.cc', + 'url_request/url_request_ftp_job.h', + ], }], ['enable_built_in_dns==1', { 'defines': [ @@ -283,8 +300,10 @@ 'third_party/nss/ssl/cmpcert.c', ], }], - [ 'enable_websockets == 1', { - 'sources': ['<@(net_websockets_sources)'] + [ 'enable_websockets != 1', { + 'sources/': [ + ['exclude', '^websockets/'], + ], }], [ 'enable_mdns != 1', { 'sources!' : [ |