Commit dcf58536 authored by Marijn Kruisselbrink's avatar Marijn Kruisselbrink Committed by Commit Bot

Fix dependencies of blink/public/common:headers.

This source_set target should not depend on mojom_core, as that pulls in
the .cc files of the blink mojom bindings in addition to the header files,
which can result in duplicate symbols and weird linking errors. Instead
depend on mojom_core_headers.

Bug: 717812
Change-Id: I4a359cfc1592f2557717b31966bfa8cdda9ed812
Reviewed-on: https://chromium-review.googlesource.com/1176070
Commit-Queue: Marijn Kruisselbrink <mek@chromium.org>
Commit-Queue: Chase Phillips <cmp@chromium.org>
Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Reviewed-by: default avatarChase Phillips <cmp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#583485}
parent 46499626
......@@ -6,9 +6,12 @@ import("//build/config/jumbo.gni")
import("//testing/test.gni")
jumbo_source_set("common") {
# No target should directly depend on this target since this is just the
# source set rather than the actual component that can be linked to.
# Dependencies instead should be to //third_party/blink/public/common:common.
visibility = [
"//third_party/blink/*",
":*",
"//third_party/blink/public/common",
"//third_party/blink/public:all_blink",
]
defines = [ "BLINK_COMMON_IMPLEMENTATION=1" ]
......@@ -129,6 +132,5 @@ jumbo_source_set("common_unittests_sources") {
"font_unique_name_lookup/font_table_matcher_unittest.cc",
"font_unique_name_lookup/icu_fold_case_util_unittest.cc",
]
deps += [ ":common" ]
}
}
......@@ -71,7 +71,8 @@ source_set("headers") {
]
public_deps = [
"//third_party/blink/public/mojom:mojom_core",
"//skia",
"//third_party/blink/public/mojom:mojom_core_headers",
]
deps = [
......
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