Commit d50644d6 authored by Victor Costan's avatar Victor Costan Committed by Commit Bot

sqlite: Specify public interface.

This CL sets the public interface of //third_party/sqlite to consist of
sqlite3.h (general entry point) and recovery.h (header for our custom
recovery extension).

The CL also adds dependencies on //third_party/sqlite where necessary.
These dependencies weren't caught by GN before because SQLite's BUILD.gn
has missed sqlite3.h completely, so "gn check" completely ignored the
includes pointing to it.

Change-Id: I38f95bd30302a6d62d778476893f0d5a2a939581
Reviewed-on: https://chromium-review.googlesource.com/1146320Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577246}
parent 4953b70f
...@@ -903,6 +903,7 @@ jumbo_static_library("extensions") { ...@@ -903,6 +903,7 @@ jumbo_static_library("extensions") {
"//third_party/leveldatabase", "//third_party/leveldatabase",
"//third_party/libaddressinput:util", "//third_party/libaddressinput:util",
"//third_party/re2", "//third_party/re2",
"//third_party/sqlite",
"//third_party/zlib/google:zip", "//third_party/zlib/google:zip",
"//ui/accessibility:ax_enums_mojo", "//ui/accessibility:ax_enums_mojo",
"//ui/base", "//ui/base",
......
...@@ -237,6 +237,7 @@ source_set("unit_tests") { ...@@ -237,6 +237,7 @@ source_set("unit_tests") {
"//sql", "//sql",
"//sql:test_support", "//sql:test_support",
"//testing/gtest", "//testing/gtest",
"//third_party/sqlite",
"//ui/gfx", "//ui/gfx",
"//ui/gfx:test_support", "//ui/gfx:test_support",
"//url", "//url",
......
...@@ -446,6 +446,7 @@ source_set("unit_tests") { ...@@ -446,6 +446,7 @@ source_set("unit_tests") {
"//sql:test_support", "//sql:test_support",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
"//third_party/sqlite",
"//ui/base", "//ui/base",
"//url", "//url",
] ]
......
...@@ -178,6 +178,7 @@ jumbo_source_set("browser") { ...@@ -178,6 +178,7 @@ jumbo_source_set("browser") {
"//third_party/icu", "//third_party/icu",
"//third_party/libyuv", "//third_party/libyuv",
"//third_party/re2", "//third_party/re2",
"//third_party/sqlite",
"//third_party/webrtc/media:rtc_media_base", "//third_party/webrtc/media:rtc_media_base",
"//third_party/webrtc/modules/desktop_capture:primitives", "//third_party/webrtc/modules/desktop_capture:primitives",
"//third_party/webrtc/rtc_base:rtc_base", "//third_party/webrtc/rtc_base:rtc_base",
......
...@@ -716,6 +716,7 @@ target(link_target_type, "renderer") { ...@@ -716,6 +716,7 @@ target(link_target_type, "renderer") {
"//third_party/libvpx", "//third_party/libvpx",
"//third_party/libyuv", "//third_party/libyuv",
"//third_party/opus", "//third_party/opus",
"//third_party/sqlite",
"//third_party/webrtc/api:libjingle_logging_api", "//third_party/webrtc/api:libjingle_logging_api",
"//third_party/webrtc/api:libjingle_peerconnection_api", "//third_party/webrtc/api:libjingle_peerconnection_api",
"//third_party/webrtc/api:rtc_stats_api", "//third_party/webrtc/api:rtc_stats_api",
......
...@@ -1862,6 +1862,7 @@ test("content_unittests") { ...@@ -1862,6 +1862,7 @@ test("content_unittests") {
"//third_party/metrics_proto", "//third_party/metrics_proto",
"//third_party/opus", "//third_party/opus",
"//third_party/re2", "//third_party/re2",
"//third_party/sqlite",
"//third_party/webrtc/api:libjingle_peerconnection_api", "//third_party/webrtc/api:libjingle_peerconnection_api",
"//third_party/webrtc/api:rtc_stats_api", "//third_party/webrtc/api:rtc_stats_api",
"//third_party/webrtc/api/video:video_frame", "//third_party/webrtc/api/video:video_frame",
......
...@@ -311,6 +311,7 @@ source_set("unittests") { ...@@ -311,6 +311,7 @@ source_set("unittests") {
"//sql:test_support", "//sql:test_support",
"//testing/gtest", "//testing/gtest",
"//third_party/leveldatabase", "//third_party/leveldatabase",
"//third_party/sqlite",
] ]
} }
......
...@@ -182,12 +182,17 @@ config("sqlite_warnings") { ...@@ -182,12 +182,17 @@ config("sqlite_warnings") {
# Naming the library "sqlite3" can cause conflicts with the system library. # Naming the library "sqlite3" can cause conflicts with the system library.
component("chromium_sqlite3") { component("chromium_sqlite3") {
visibility = [ ":*" ] visibility = [ ":*" ]
public = [
"sqlite3.h",
"src/src/recover.h",
]
sources = [ sources = [
"amalgamation/config.h", "amalgamation/config.h",
"amalgamation/sqlite3.c", "amalgamation/sqlite3.c",
"amalgamation/sqlite3.h", "amalgamation/sqlite3.h",
"src/src/recover.c", "src/src/recover.c",
"src/src/recover.h",
"src/src/recover_varint.c", "src/src/recover_varint.c",
] ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment