Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(372)

Side by Side Diff: mojo/tools/roll/net_sql.patch

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « mojo/tools/roll/cc_strip_video.patch ('k') | mojo/tools/roll/update_from_chromium.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 diff --git a/net/BUILD.gn b/net/BUILD.gn
2 index 73eb465..4cecaef 100644
3 --- a/net/BUILD.gn
4 +++ b/net/BUILD.gn
5 @@ -541,6 +541,8 @@ grit("net_resources") {
6 ]
7 }
8
9 +if (false) {
10 +
11 static_library("extras") {
12 sources = gypi_values.net_extras_sources
13 configs += [ "//build/config/compiler:wexit_time_destructors" ]
14 @@ -550,6 +552,8 @@ static_library("extras") {
15 ]
16 }
17
18 +} # if (false)
19 +
20 static_library("http_server") {
21 sources = [
22 "server/http_connection.cc",
23 @@ -1124,11 +1128,14 @@ if (!is_android && !is_win && !is_mac) {
24 test("net_unittests") {
25 sources = gypi_values.net_test_sources
26
27 + sources -= [
28 + "extras/sqlite/sqlite_channel_id_store_unittest.cc",
29 + ]
30 +
31 configs += [ ":net_win_size_truncation" ]
32 defines = []
33
34 deps = [
35 - ":extras",
36 ":http_server",
37 ":net",
38 ":quic_tools",
OLDNEW
« no previous file with comments | « mojo/tools/roll/cc_strip_video.patch ('k') | mojo/tools/roll/update_from_chromium.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698