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

Unified Diff: mojo/tools/roll/net_sql.patch

Issue 774413002: Update from https://crrev.com/306724 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/config/BUILD.gn ('k') | mojo/tools/roll/skia_build.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/tools/roll/net_sql.patch
diff --git a/mojo/tools/roll/net_sql.patch b/mojo/tools/roll/net_sql.patch
index fd87d4cfdbad26935b6e5cee975b97af7056584f..f594a1e2f16ebc129b2be88d595c2483aeff1616 100644
--- a/mojo/tools/roll/net_sql.patch
+++ b/mojo/tools/roll/net_sql.patch
@@ -1,8 +1,8 @@
diff --git a/net/BUILD.gn b/net/BUILD.gn
-index 05da14c..00d47f4 100644
+index 73eb465..4cecaef 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
-@@ -564,6 +564,8 @@ grit("net_resources") {
+@@ -541,6 +541,8 @@ grit("net_resources") {
]
}
@@ -11,7 +11,7 @@ index 05da14c..00d47f4 100644
static_library("extras") {
sources = gypi_values.net_extras_sources
configs += [ "//build/config/compiler:wexit_time_destructors" ]
-@@ -573,6 +575,8 @@ static_library("extras") {
+@@ -550,6 +552,8 @@ static_library("extras") {
]
}
@@ -20,19 +20,19 @@ index 05da14c..00d47f4 100644
static_library("http_server") {
sources = [
"server/http_connection.cc",
-@@ -1120,11 +1124,14 @@ source_set("quic_tools") {
- test("net_unittests") {
- sources = gypi_values.net_test_sources
+@@ -1124,11 +1128,14 @@ if (!is_android && !is_win && !is_mac) {
+ test("net_unittests") {
+ sources = gypi_values.net_test_sources
-+ sources -= [
-+ "extras/sqlite/sqlite_channel_id_store_unittest.cc",
-+ ]
++ sources -= [
++ "extras/sqlite/sqlite_channel_id_store_unittest.cc",
++ ]
+
- configs += [ ":net_win_size_truncation" ]
- defines = []
+ configs += [ ":net_win_size_truncation" ]
+ defines = []
- deps = [
-- ":extras",
- ":http_server",
- ":net",
- ":quic_tools",
+ deps = [
+- ":extras",
+ ":http_server",
+ ":net",
+ ":quic_tools",
« no previous file with comments | « gpu/config/BUILD.gn ('k') | mojo/tools/roll/skia_build.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698