summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoone.hur <joone.hur@intel.com>2015-05-13 17:01:44 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-14 00:02:50 +0000
commit64b0e3fa8022ac6932b72e2f86784b83ab03139b (patch)
tree961b32c7145afc5f84ac23b8c2d5ed79c55e5d7a
parentca5b918a4c95dd89f916353459ae3da88dd3259a (diff)
downloadchromium_src-64b0e3fa8022ac6932b72e2f86784b83ab03139b.zip
chromium_src-64b0e3fa8022ac6932b72e2f86784b83ab03139b.tar.gz
chromium_src-64b0e3fa8022ac6932b72e2f86784b83ab03139b.tar.bz2
Fix link errors with Skia in libui_touch_selection.so
When building a debug version of Chromium in Linux with component=shared_library build flag, there are link errors as follows: error: undefined reference to 'SkDebugf_FileLine' error: undefined reference to 'SkToS32' BUG=None Review URL: https://codereview.chromium.org/1128203009 Cr-Commit-Position: refs/heads/master@{#329745}
-rw-r--r--ui/touch_selection/BUILD.gn2
-rw-r--r--ui/touch_selection/ui_touch_selection.gyp2
2 files changed, 4 insertions, 0 deletions
diff --git a/ui/touch_selection/BUILD.gn b/ui/touch_selection/BUILD.gn
index c5bf894..e79c563 100644
--- a/ui/touch_selection/BUILD.gn
+++ b/ui/touch_selection/BUILD.gn
@@ -27,6 +27,7 @@ component("touch_selection") {
defines = [ "UI_TOUCH_SELECTION_IMPLEMENTATION" ]
deps = [
+ "//skia:skia",
"//base:base",
"//ui/aura:aura",
"//ui/aura_extra:aura_extra",
@@ -40,6 +41,7 @@ component("touch_selection") {
if (!use_aura) {
deps -= [
+ "//skia:skia",
"//ui/aura:aura",
"//ui/aura_extra:aura_extra",
"//ui/compositor:compositor",
diff --git a/ui/touch_selection/ui_touch_selection.gyp b/ui/touch_selection/ui_touch_selection.gyp
index a31bf3c..11cca1f 100644
--- a/ui/touch_selection/ui_touch_selection.gyp
+++ b/ui/touch_selection/ui_touch_selection.gyp
@@ -12,6 +12,7 @@
'type': '<(component)',
'dependencies': [
'../../base/base.gyp:base',
+ '../../skia/skia.gyp:skia',
'../aura/aura.gyp:aura',
'../aura_extra/aura_extra.gyp:aura_extra',
'../base/ui_base.gyp:ui_base',
@@ -41,6 +42,7 @@
'conditions': [
['use_aura==0', {
'dependencies!': [
+ '../../skia/skia.gyp:skia',
'../aura/aura.gyp:aura',
'../aura_extra/aura_extra.gyp:aura_extra',
'../compositor/compositor.gyp:compositor',