Commit 67d614f4 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

Remove dependency on //third_party/google_toolbox_for_mac

With https://crrev.com/c/1912239, //third_party/breakpad no longer
has any dependency on //third_party/google_toolbox_for_mac (it no
longer uses GTMLogger), so remove the deps.

Add missing reference to "sqlite3" on //ios/third_party/firebase
that was previously pulled transitively via google_toolbox_for_mac.

Bug: 1012115, 1024322
Change-Id: I963470cd5a327edb2562a873fcc283eb46b2af6c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1913414
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarMark Mentovai <mark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715250}
parent 1888f354
...@@ -30,5 +30,13 @@ config("firebase_config") { ...@@ -30,5 +30,13 @@ config("firebase_config") {
"GoogleUtilities.framework", "GoogleUtilities.framework",
"nanopb.framework", "nanopb.framework",
"StoreKit.framework", "StoreKit.framework",
# GoogleAppMeasurement.framework is a framework containing a static library
# and it has a dependency on sqlite3. It cannot use the version built with
# Chromium since the names are mangled, so add the dependency here.
# TODO(crbug.com/1024322): This dependency should be resolved. The best way
# would be to have dynamic library version of firebase framework (then the
# framework would implicitly have the depency on sqlite3 from the system).
"sqlite3",
] ]
} }
...@@ -1047,14 +1047,6 @@ if (is_ios) { ...@@ -1047,14 +1047,6 @@ if (is_ios) {
"breakpad/src/common/mac", "breakpad/src/common/mac",
] ]
deps = [
# Breakpad includes its own copy of GTMLogger (in the file
# breakpad/src/common/mac/GTMLogger.m). As Chromium links
# to both on iOS, do not use the copy shipped with breakpad
# but instead use the version from google_toolbox_for_mac.
"//third_party/google_toolbox_for_mac",
]
public_configs = [ ":client_config" ] public_configs = [ ":client_config" ]
if (is_clang) { if (is_clang) {
......
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