[sqlite] sql::Recovery working under USE_SYSTEM_SQLITE.

third_party/sqlite/BUILD.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 declare_args() {
   # Controls whether the build should uses the version of sqlite3 library
   # shipped with the system (currently only supported on iOS) or the one
   # shipped with Chromium source.
   use_system_sqlite = is_ios
 }
@@ skipping 205 matching lines @@
     defines = [ "USE_SYSTEM_SQLITE" ]
     if (is_ios) {
       libs = [ "sqlite3" ]
     } else {
       assert(false, "extra flags to use system sqlite3 library missing")
     }
   }
 
   source_set("sqlite") {
     public_configs = [ ":sqlite_config" ]
+    deps = [
+      ":sqlite_recover",
+    ]

[Scott Hess - ex-Googler, 2016/03/02 01:24:44]

Since this is a custom-to-us module, we should be able to safely include it for
_any_ use_system_sqlite case.  sqlite_regexp is more debatable (though I suspect
it would also work fine for any use_system_sqlite case, too).

     if (is_ios) {
       deps = [
         ":sqlite_regexp",
       ]
     }
   }
 
+  source_set("sqlite_recover") {
+    sources = [
+      # TODO(shess): Move out of the SQLite source tree, perhaps to ext/.
+      "src/src/recover.c",
+      "src/src/recover.h",
+      "src/src/recover_varint.c",
+    ]
+  }

[Scott Hess - ex-Googler, 2016/03/02 01:24:44]

This module could be pulled outside of the use_system_sqlite case entirely, and
the sql/BUILD.gn could depend on sqlite:sqlite_recover for either case.  It
should work either way, since the module uses no globals.  The main reason I
went with this split is simply being conservative.

Of course, another solution would be to pull the entire module into sql/
somewhere.  That would make the in-SQLite testing harder, though it could be
rewritten as a unit test.  I'd like to hold off on that kind of move until I try
upstreaming things.  If SQLite accepts it, then lots of problems are solved.

+
   if (is_ios) {
     source_set("sqlite_regexp") {
       defines = [
         # Necessary to statically compile the extension.
         "SQLITE_CORE",
         "SQLITE_ENABLE_ICU",
         "SQLITE_ENABLE_MEMORY_MANAGEMENT",
       ]
       sources = [
         "src/ext/icu/icu.c",
       ]
       deps = [
         "//third_party/icu",
       ]
       if (is_clang) {
         # src/ext/icu/icu.c uses assert(!"string") which causes warnings about
         # conversion from string literal to bool.
         configs -= [ "//build/config/clang:extra_warnings" ]
       }
     }
   }
 }