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

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

Issue 949043002: Add //third_party/sqlite to dirs_to_snapshot, remove net_sql.patch (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | mojo/tools/roll/update_from_chromium.py » ('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
deleted file mode 100644
index f594a1e2f16ebc129b2be88d595c2483aeff1616..0000000000000000000000000000000000000000
--- a/mojo/tools/roll/net_sql.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/net/BUILD.gn b/net/BUILD.gn
-index 73eb465..4cecaef 100644
---- a/net/BUILD.gn
-+++ b/net/BUILD.gn
-@@ -541,6 +541,8 @@ grit("net_resources") {
- ]
- }
-
-+if (false) {
-+
- static_library("extras") {
- sources = gypi_values.net_extras_sources
- configs += [ "//build/config/compiler:wexit_time_destructors" ]
-@@ -550,6 +552,8 @@ static_library("extras") {
- ]
- }
-
-+} # if (false)
-+
- static_library("http_server") {
- sources = [
- "server/http_connection.cc",
-@@ -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",
-+ ]
-+
- configs += [ ":net_win_size_truncation" ]
- defines = []
-
- deps = [
-- ":extras",
- ":http_server",
- ":net",
- ":quic_tools",
« no previous file with comments | « no previous file | mojo/tools/roll/update_from_chromium.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698